From f004e26432284b801fb6a3cd38ad79098d728f4b Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Thu, 28 May 2015 10:48:16 -0400
Subject: [PATCH] Update to 0.3

- it mostly works now.

Signed-off-by: Peter Jones <pjones@redhat.com>
---
 COPYING          |  5 ++---
 Makefile         |  2 +-
 fwupdate.spec.in | 42 ++++++++++++++++++------------------------
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/COPYING b/COPYING
index eeb586b..e8530f8 100644
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -304,8 +304,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/Makefile b/Makefile
index af256d0..1a2b6f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 TOPDIR=$(shell pwd)
-VERSION = 0.2
+VERSION = 0.3
 SUBDIRS = efi linux docs
 
 all clean install :
diff --git a/fwupdate.spec.in b/fwupdate.spec.in
index bdc997f..2f26b98 100644
--- a/fwupdate.spec.in
+++ b/fwupdate.spec.in
@@ -1,4 +1,5 @@
-%global efivar_version 0.16
+%global efivar_version 0.19-1
+%global efibootmgr_version 0.12-1
 
 Name:           fwupdate
 Version:        @@VERSION@@
@@ -6,13 +7,12 @@ Release:        1%{?dist}
 Summary:        Tools to manage UEFI firmware updates
 License:        GPLv2+
 URL:            https://github.com/rhinstaller/fwupdate
-Requires:       %{name}-libs = %{version}-%{release}
-Requires:	efibootmgr >= 0.11.0-2
-BuildRequires:	efivar-devel >= %{efivar_version}
-BuildRequires:	gnu-efi gnu-efi-devel pesign
-ExclusiveArch:	x86_64 %{ix86} aarch64
-
-BuildRequires:  popt-devel git
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+BuildRequires:  efivar-devel >= %{efivar_version}
+BuildRequires:  gnu-efi gnu-efi-devel
+BuildRequires:  pesign
+BuildRequires:  popt-devel git gettext pkgconfig
+ExclusiveArch:  x86_64 %{ix86} aarch64
 
 %ifarch x86_64
 %global efiarch x64
@@ -25,12 +25,7 @@ BuildRequires:  popt-devel git
 %endif
 
 # Figure out the right file path to use
-%if 0%{?rhel}
-%global efidir redhat
-%endif
-%if 0%{?fedora}
-%global efidir fedora
-%endif
+%global efidir %(eval grep ^ID= /etc/os-release | sed -e 's/^ID=//' -e 's/rhel/redhat/')
 
 Source0:        https://github.com/rhinstaller/fwupdate/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
 
@@ -38,14 +33,14 @@ Source0:        https://github.com/rhinstaller/fwupdate/releases/download/%{name
 fwupdate provides a simple command line interface to the UEFI firmware updates.
 
 %package libs
-Summary: Library to manage UEFI firmware updates.
+Summary: Library to manage UEFI firmware updates
 
 %description libs
 Library to allow for the simple manipulation of UEFI firmware updates.
 
 %package devel
-Summary: Development headers for linfwup
-Requires: %{name}-libs = %{version}-%{release}
+Summary: Development headers for libfwup
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: efivar-devel >= %{efivar_version}
 
 %description devel
@@ -59,18 +54,17 @@ git config user.name "Fedora Ninjas"
 git add .
 git commit -a -q -m "%{version} baseline."
 git am %{patches} </dev/null
+git config --unset user.email
+git config --unset user.name
 
 %build
 make OPT_FLAGS="$RPM_OPT_FLAGS" libdir=%{_libdir} bindir=%{_bindir} \
-	EFIDIR=%{efidir}
+     EFIDIR=%{efidir} %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall EFIDIR=%{efidir} DESTDIR=${RPM_BUILD_ROOT}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
@@ -81,6 +75,8 @@ rm -rf $RPM_BUILD_ROOT
 %license COPYING
 # %%doc README
 %{_bindir}/fwupdate
+%attr(0700,root,root) %dir /boot/efi
+%dir /boot/efi/EFI/%{efidir}/
 /boot/efi/EFI/%{efidir}/fwupdate.efi
 %dir /boot/efi/EFI/%{efidir}/fw/
 %{_datadir}/locale/en/*.po
@@ -98,7 +94,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 
 %changelog
-* Fri Feb 27 2015 Peter Jones <pjones@redhat.com> - 0.1-1
+* Thu May 28 2015 Peter Jones <pjones@redhat.com> - 0.3-1
 - Here we go again.
-
-