- updated to 35

[packages/efivar.git] / efivar.spec

diff --git a/efivar.spec b/efivar.spec
index b9cb49bc9d5820d5f89a3e5106b3c195cd47b0f1..fe5c76b3350d5f133a454d3849455eb290d272a6 100644 (file)
--- a/efivar.spec
+++ b/efivar.spec
@@ -1,23 +1,29 @@
 #
 # Conditional build:
-%bcond_without static_libs     # don't build static libraries
+%bcond_without static          # efivar-static binary (static version of efivar)
+%bcond_without static_libs     # static libraries
 #
 Summary:       Tools to manage UEFI variables
 Summary(pl.UTF-8):     Narzędzia do zarządzania zmiennymi UEFI
 Name:          efivar
-Version:       0.21
+Version:       35
 Release:       1
 License:       LGPL v2.1
 Group:         Applications/System
-Source0:       https://github.com/rhinstaller/efivar/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 9b2bc790c267614b46b9c9c6528629d6
-Patch0:                %{name}-build.patch
-Patch1:                %{name}-static.patch
+#Source0Download: https://github.com/rhinstaller/efivar/releases
+Source0:       https://github.com/rhinstaller/efivar/releases/download/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: 53da18ea0cf7bba1fd9edf3098037edf
+Patch0:                %{name}-static.patch
 URL:           https://github.com/rhinstaller/efivar
+BuildRequires: linux-libc-headers >= 7:3.3
 BuildRequires: popt-devel
+%if %{with static}
+BuildRequires: glibc-static
+BuildRequires: popt-static
+%endif
 Requires:      %{name}-libs = %{version}-%{release}
 # Beside (U)EFI architectures, additionally allow x32 userspace for x86_64 boot arch
-ExclusiveArch: %{ix86} %{x8664} x32 arm aarch64 ia64
+ExclusiveArch: %{ix86} %{x8664} x32 %{arm} aarch64 ia64
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -65,12 +71,13 @@ Statyczna biblioteka efivar.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-%{__make} \
+%{__make} -j1 all static \
        CC="%{__cc}" \
        CFLAGS="%{rpmcflags}" \
+       LDFLAGS="%{rpmldflags} -Wl,-z,muldefs" \
+       %{!?with_static:STATICBINTARGETS=} \
        %{!?with_static_libs:STATICLIBTARGETS=} \
        libdir=%{_libdir}
 
@@ -79,6 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
+       %{!?with_static:STATICBINTARGETS=} \
        %{!?with_static_libs:STATICLIBTARGETS=} \
        libdir=%{_libdir}
 
@@ -92,14 +100,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.md TODO
 %attr(755,root,root) %{_bindir}/efivar
+%if %{with static}
+%attr(755,root,root) %{_bindir}/efivar-static
+%endif
 %{_mandir}/man1/efivar.1*
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libefiboot.so.0.*
-%attr(755,root,root) %ghost %{_libdir}/libefiboot.so.0
-%attr(755,root,root) %{_libdir}/libefivar.so.0.*
-%attr(755,root,root) %ghost %{_libdir}/libefivar.so.0
+%attr(755,root,root) %{_libdir}/libefiboot.so.1.*
+%attr(755,root,root) %ghost %{_libdir}/libefiboot.so.1
+%attr(755,root,root) %{_libdir}/libefivar.so.1.*
+%attr(755,root,root) %ghost %{_libdir}/libefivar.so.1
 
 %files devel
 %defattr(644,root,root,755)