From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sat, 12 Sep 2015 08:07:13 +0000 (+0200)
Subject: - updated to 0.4
X-Git-Tag: auto/th/fwupdate-0.4-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffwupdate.git;a=commitdiff_plain;h=a3b339a3f618b9f3fed7ef4f3f131bc43e008243

- updated to 0.4
- updated open patch
---

diff --git a/fwupdate-open.patch b/fwupdate-open.patch
index a79b373..c81e08a 100644
--- a/fwupdate-open.patch
+++ b/fwupdate-open.patch
@@ -1,11 +1,11 @@
---- fwupdate-10def9bb08c85761ed7fe22bc458cbc760b99d42/linux/libfwup.c.orig	2015-03-12 15:02:28.000000000 +0100
-+++ fwupdate-10def9bb08c85761ed7fe22bc458cbc760b99d42/linux/libfwup.c	2015-04-19 15:22:14.149102505 +0200
-@@ -646,7 +646,7 @@
- 		if (rc < 0)
+--- fwupdate-0.4/linux/libfwup.c.orig	2015-09-12 09:08:28.418763043 +0200
++++ fwupdate-0.4/linux/libfwup.c	2015-09-12 09:09:34.945426920 +0200
+@@ -778,7 +778,7 @@
  			goto new;
+ 		}
  
--		rc = open(filename, O_CREAT|O_TRUNC|O_CLOEXEC|O_RDWR);
-+		rc = open(filename, O_CREAT|O_TRUNC|O_CLOEXEC|O_RDWR, 0666);
- 		if (rc < 0)
+-		rc = open(fullpath, O_CREAT|O_TRUNC|O_CLOEXEC|O_RDWR);
++		rc = open(fullpath, O_CREAT|O_TRUNC|O_CLOEXEC|O_RDWR, 0666);
+ 		if (rc < 0) {
+ 			free(relpath);
  			goto new;
- 		fd = rc;
diff --git a/fwupdate.spec b/fwupdate.spec
index 1f38917..48badb6 100644
--- a/fwupdate.spec
+++ b/fwupdate.spec
@@ -5,21 +5,21 @@
 Summary:	Tools to manage UEFI firmware updates
 Summary(pl.UTF-8):	Narzędzia do zarządzania aktualizacjami firmware'u przez UEFI
 Name:		fwupdate
-Version:	0.2
+Version:	0.4
 Release:	1
 License:	GPL v2
 Group:		Libraries
-Source0:	https://github.com/rhinstaller/fwupdate/archive/10def9bb08c85761ed7fe22bc458cbc760b99d42/%{name}-%{version}.tar.gz
-# Source0-md5:	d610a0f98dc262eaa71fb2891ba46ad9
+Source0:	https://github.com/rhinstaller/fwupdate/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	b016615c506aba60c5a2de3de7ce1bab
 Patch0:		%{name}-open.patch
 URL:		https://github.com/rhinstaller/fwupdate
-BuildRequires:	efivar-devel >= 0.16
+BuildRequires:	efivar-devel >= 0.19
 BuildRequires:	gnu-efi
 %{?with_pesign:BuildRequires:	pesign}
 BuildRequires:	popt-devel
 BuildRequires:	sed >= 4.0
 Requires:	%{name}-libs = %{version}-%{release}
-#Requires(post):	efibootmgr >= 0.11.0
+#Requires(post):	efibootmgr >= 0.12
 ExclusiveArch:	%{ix86} %{x8664} arm aarch64 ia64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -37,7 +37,7 @@ firmware'u przez UEFI.
 Summary:	Library to manage UEFI firmware updates
 Summary(pl.UTF-8):	Biblioteka do zarządzania aktualizacjami firmware'u przez UEFI
 Group:		Libraries
-Requires:	efivar-libs >= 0.16
+Requires:	efivar-libs >= 0.19
 
 %description libs
 Library to manage UEFI firmware updates.
@@ -50,7 +50,7 @@ Summary:	Header files for libfwup library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libfwup
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	efivar-devel >= 0.16
+Requires:	efivar-devel >= 0.19
 
 %description devel
 Header files for libfwup library.
@@ -59,10 +59,9 @@ Header files for libfwup library.
 Pliki nagłówkowe biblioteki libfwup.
 
 %prep
-%setup -q -n fwupdate-10def9bb08c85761ed7fe22bc458cbc760b99d42
+%setup -q
 %patch0 -p1
 
-%{__sed} -i -e 's,/usr/lib64\(/gnuefi\)\?,%{_libdir},g' efi/Makefile
 %if %{without pesign}
 %{__sed} -i -e 's/pesign/cp $< $@ \&\& : &/' efi/Makefile
 %endif
@@ -75,6 +74,7 @@ Pliki nagłówkowe biblioteki libfwup.
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}" \
 	EFIDIR=%{efidir} \
+	GNUEFIDIR=%{_libdir} \
 	libdir=%{_libdir}
 
 %install
@@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 	DESTDIR=$RPM_BUILD_ROOT \
 	EFIDIR=%{efidir} \
-	libdir=$RPM_BUILD_ROOT%{_libdir}
+	libdir=%{_libdir}
 
 # empty
 %{__rm} $RPM_BUILD_ROOT%{_localedir}/en/*.po
@@ -106,17 +106,22 @@ efibootmgr -C -b 1337 -d /dev/sda -p 1 -l /EFI/%{efidir}/fwupdate.efi -L "Firmwa
 
 %files
 %defattr(644,root,root,755)
+%doc TODO
 %attr(755,root,root) %{_bindir}/fwupdate
+%{_mandir}/man1/fwupdate.1*
 %dir /boot/efi/EFI/%{efidir}
 /boot/efi/EFI/%{efidir}/fwupdate.efi
 %dir /boot/efi/EFI/%{efidir}/fw
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libfwup.so.0.2
+%attr(755,root,root) %{_libdir}/libfwup.so.0.4
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfwup.so
 %{_includedir}/fwup.h
 %{_pkgconfigdir}/fwup.pc
+%{_mandir}/man3/fwup_*.3*
+%{_mandir}/man3/libfwup.3*
+%{_mandir}/man3/libfwup.h.3*