- updated to 39

[packages/efivar.git] / efivar.spec

diff --git a/efivar.spec b/efivar.spec
index 212ad385c73d15f6121e17dd6a992ee4497f53f5..2be0e07be87f1f51e36bec39e37920edc01ac570 100644 (file)
--- a/efivar.spec
+++ b/efivar.spec
@@ -1,21 +1,23 @@
 #
 # Conditional build:
-%bcond_without static          # efivar-static binary (static version of efivar)
+%bcond_with    static          # efivar-static binary (static version of efivar; broken as of 38)
 %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:       30
+Version:       39
 Release:       1
 License:       LGPL v2.1
 Group:         Applications/System
 #Source0Download: https://github.com/rhinstaller/efivar/releases
-Source0:       https://github.com/rhinstaller/efivar/releases/download/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 143f055904fceaad6ed39f8e849ba079
+Source0:       https://github.com/rhinstaller/efivar/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: a8fc3e79336cd6e738ab44f9bc96a5aa
 Patch0:                %{name}-static.patch
+Patch1:                %{name}-link.patch
 URL:           https://github.com/rhinstaller/efivar
 BuildRequires: linux-libc-headers >= 7:3.3
+BuildRequires: mandoc
 BuildRequires: popt-devel
 %if %{with static}
 BuildRequires: glibc-static
@@ -23,7 +25,7 @@ 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
@@ -71,24 +73,25 @@ Statyczna biblioteka efivar.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-%{__make} -j1 \
+%{__make} -j1 all static \
        CC="%{__cc}" \
-       CFLAGS="%{rpmcflags}" \
+       CFLAGS="%{rpmcflags} $WFLAGS" \
        LDFLAGS="%{rpmldflags} -Wl,-z,muldefs" \
-       %{!?with_static:BINTARGETS=efivar} \
+       %{!?with_static:STATICBINTARGETS=} \
        %{!?with_static_libs:STATICLIBTARGETS=} \
-       libdir=%{_libdir}
+       LIBDIR=%{_libdir}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
-       %{!?with_static:BINTARGETS=efivar} \
+       %{!?with_static:STATICBINTARGETS=} \
        %{!?with_static_libs:STATICLIBTARGETS=} \
-       libdir=%{_libdir}
+       LIBDIR=%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,25 +102,31 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.md TODO
+%attr(755,root,root) %{_bindir}/efisecdb
 %attr(755,root,root) %{_bindir}/efivar
 %if %{with static}
 %attr(755,root,root) %{_bindir}/efivar-static
 %endif
+%{_mandir}/man1/efisecdb.1*
 %{_mandir}/man1/efivar.1*
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libefiboot.so.1.*
 %attr(755,root,root) %ghost %{_libdir}/libefiboot.so.1
+%attr(755,root,root) %{_libdir}/libefisec.so.1.*
+%attr(755,root,root) %ghost %{_libdir}/libefisec.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)
 %attr(755,root,root) %{_libdir}/libefiboot.so
+%attr(755,root,root) %{_libdir}/libefisec.so
 %attr(755,root,root) %{_libdir}/libefivar.so
 %{_includedir}/efivar
 %{_pkgconfigdir}/efiboot.pc
+%{_pkgconfigdir}/efisec.pc
 %{_pkgconfigdir}/efivar.pc
 %{_mandir}/man3/efi_*.3*
 
@@ -125,5 +134,6 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libefiboot.a
+%{_libdir}/libefisec.a
 %{_libdir}/libefivar.a
 %endif