Update to 0.3

- it mostly works now.

Signed-off-by: Peter Jones <[email protected]>

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.

Makefile

@@ -1,5 +1,5 @@
 TOPDIR=$(shell pwd)
-VERSION = 0.2
+VERSION = 0.3
 SUBDIRS = efi linux docs
 
 all clean install :

fwupdate.spec.in

@@ -1,18 +1,18 @@
-%global efivar_version 0.16
+%global efivar_version 0.19-1
+%global efibootmgr_version 0.12-1
 
 Name:           fwupdate
 Version:        @@VERSION@@
 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,27 +25,22 @@ 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
 
 %description
 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 <[email protected]> - 0.1-1
+* Thu May 28 2015 Peter Jones <[email protected]> - 0.3-1
 - Here we go again.
-
-