[packages/fwupdate] - updated to 0.5 (note: soname changed) - removed obsolete open patch
qboosh
qboosh at pld-linux.org
Sun Nov 29 20:18:30 CET 2015
commit 7e7be65eedf015fc0ffc7b78be1c21caa91015b2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Nov 29 20:19:06 2015 +0100
- updated to 0.5 (note: soname changed)
- removed obsolete open patch
fwupdate-open.patch | 11 -----------
fwupdate.spec | 57 ++++++++++++++++++++++++++++++++++++++++++++++-------
2 files changed, 50 insertions(+), 18 deletions(-)
---
diff --git a/fwupdate.spec b/fwupdate.spec
index 48badb6..551f723 100644
--- a/fwupdate.spec
+++ b/fwupdate.spec
@@ -5,13 +5,12 @@
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.4
+Version: 0.5
Release: 1
License: GPL v2
Group: Libraries
Source0: https://github.com/rhinstaller/fwupdate/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: b016615c506aba60c5a2de3de7ce1bab
-Patch0: %{name}-open.patch
+# Source0-md5: 254fdbfadf18a47018aca37fcc2e4089
URL: https://github.com/rhinstaller/fwupdate
BuildRequires: efivar-devel >= 0.19
BuildRequires: gnu-efi
@@ -58,9 +57,21 @@ Header files for libfwup library.
%description devel -l pl.UTF-8
Pliki nagłówkowe biblioteki libfwup.
+%package -n bash-completion-fwupdate
+Summary: Bash completion for fwupdate command
+Summary(pl.UTF-8): Bashowe uzupełnianie parametrów polecenia fwupdate
+Group: Applications/Shells
+Requires: %{name} = %{version}-%{release}
+Requires: bash-completion >= 2.0
+
+%description -n bash-completion-fwupdate
+Bash completion for fwupdate command.
+
+%description -n bash-completion-fwupdate -l pl.UTF-8
+Bashowe uzupełnianie parametrów polecenia fwupdate.
+
%prep
%setup -q
-%patch0 -p1
%if %{without pesign}
%{__sed} -i -e 's/pesign/cp $< $@ \&\& : &/' efi/Makefile
@@ -75,7 +86,8 @@ Pliki nagłówkowe biblioteki libfwup.
CFLAGS="%{rpmcflags}" \
EFIDIR=%{efidir} \
GNUEFIDIR=%{_libdir} \
- libdir=%{_libdir}
+ libdir=%{_libdir} \
+ libexecdir=%{_libexecdir}
%install
rm -rf $RPM_BUILD_ROOT
@@ -86,11 +98,19 @@ rm -rf $RPM_BUILD_ROOT
%endif
DESTDIR=$RPM_BUILD_ROOT \
EFIDIR=%{efidir} \
- libdir=%{_libdir}
+ libdir=%{_libdir} \
+ libexecdir=%{_libexecdir}
+
+# fix location
+install -d $RPM_BUILD_ROOT%{systemdunitdir}
+%{__mv} $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system/*.service $RPM_BUILD_ROOT%{systemdunitdir}
# empty
%{__rm} $RPM_BUILD_ROOT%{_localedir}/en/*.po
+# debuginfo installed by make install?
+%{__rm} -r $RPM_BUILD_ROOT{%{_prefix}/lib/debug,%{_prefix}/src/debug}
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -108,14 +128,33 @@ efibootmgr -C -b 1337 -d /dev/sda -p 1 -l /EFI/%{efidir}/fwupdate.efi -L "Firmwa
%defattr(644,root,root,755)
%doc TODO
%attr(755,root,root) %{_bindir}/fwupdate
+%dir %{_libexecdir}/fwupdate
+%attr(755,root,root) %{_libexecdir}/fwupdate/cleanup
+%{_datadir}/fwupdate
+%{systemdunitdir}/fwupdate-cleanup.service
%{_mandir}/man1/fwupdate.1*
%dir /boot/efi/EFI/%{efidir}
+%ifarch %{ix86}
+/boot/efi/EFI/%{efidir}/fwupia32.efi
+%endif
+%ifarch %{x8664} x32
+/boot/efi/EFI/%{efidir}/fwupx64.efi
+%endif
+%ifarch arm
+/boot/efi/EFI/%{efidir}/fwuparm.efi
+%endif
+%ifarch aarch64
+/boot/efi/EFI/%{efidir}/fwupaa64.efi
+%endif
+%ifnarch %{ix86} %{x8664} x32 arm aarch64
/boot/efi/EFI/%{efidir}/fwupdate.efi
+%endif
%dir /boot/efi/EFI/%{efidir}/fw
%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libfwup.so.0.4
+%attr(755,root,root) %{_libdir}/libfwup.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfwup.so.0
%files devel
%defattr(644,root,root,755)
@@ -125,3 +164,7 @@ efibootmgr -C -b 1337 -d /dev/sda -p 1 -l /EFI/%{efidir}/fwupdate.efi -L "Firmwa
%{_mandir}/man3/fwup_*.3*
%{_mandir}/man3/libfwup.3*
%{_mandir}/man3/libfwup.h.3*
+
+%files -n bash-completion-fwupdate
+%defattr(644,root,root,755)
+%{_datadir}/bash-completion/completions/fwupdate
diff --git a/fwupdate-open.patch b/fwupdate-open.patch
deleted file mode 100644
index c81e08a..0000000
--- a/fwupdate-open.patch
+++ /dev/null
@@ -1,11 +0,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(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;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fwupdate.git/commitdiff/7e7be65eedf015fc0ffc7b78be1c21caa91015b2
More information about the pld-cvs-commit
mailing list