From: Jacek Konieczny <jajcus@jajcus.net>
Date: Thu, 10 Nov 2016 19:11:18 +0000 (+0100)
Subject: Version: 30
X-Git-Tag: auto/th/efivar-30-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fefivar.git;a=commitdiff_plain;h=b5d50c2b93d72ac5705cb462ea47a9210e07689f

Version: 30
---

diff --git a/efivar-static.patch b/efivar-static.patch
index 4231927..cb7e630 100644
--- a/efivar-static.patch
+++ b/efivar-static.patch
@@ -1,9 +1,9 @@
---- efivar-0.23/src/Makefile.orig	2016-06-23 20:40:50.398411788 +0200
-+++ efivar-0.23/src/Makefile	2016-06-23 20:43:14.654297154 +0200
-@@ -77,6 +77,7 @@
- 		$(INSTALL) -m 755 $(x) $(DESTDIR)$(libdir)/$(x).$(VERSION) ;\
- 		ln -fs $(x).$(VERSION) $(DESTDIR)$(libdir)/$(x).$(MAJOR_VERSION);\
- 		ln -fs $(x).$(VERSION) $(DESTDIR)$(libdir)/$(x); )
+--- efivar-30/src/Makefile.orig	2016-11-10 20:02:50.692925296 +0100
++++ efivar-30/src/Makefile	2016-11-10 20:04:37.653753960 +0100
+@@ -84,6 +84,7 @@
+ 		ln -fs $(x).1.$(VERSION) $(DESTDIR)$(libdir)/$(x).1 ;\
+ 		ln -fs $(x).1.$(VERSION) $(DESTDIR)$(libdir)/$(x) ;\
+ 		)
 +	$(foreach x, $(STATICLIBTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(libdir);)
  	$(INSTALL) -d -m 755 $(DESTDIR)$(PCDIR)
  	$(foreach x, $(PCTARGETS), $(INSTALL) -m 644 $(x) $(DESTDIR)$(PCDIR) ;)
diff --git a/efivar.spec b/efivar.spec
index 73ea546..212ad38 100644
--- a/efivar.spec
+++ b/efivar.spec
@@ -6,13 +6,13 @@
 Summary:	Tools to manage UEFI variables
 Summary(pl.UTF-8):	Narzędzia do zarządzania zmiennymi UEFI
 Name:		efivar
-Version:	0.24
+Version:	30
 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:	38b6912e870e8a735e3a488e8e62d348
+# Source0-md5:	143f055904fceaad6ed39f8e849ba079
 Patch0:		%{name}-static.patch
 URL:		https://github.com/rhinstaller/efivar
 BuildRequires:	linux-libc-headers >= 7:3.3
@@ -76,6 +76,7 @@ Statyczna biblioteka efivar.
 %{__make} -j1 \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}" \
+	LDFLAGS="%{rpmldflags} -Wl,-z,muldefs" \
 	%{!?with_static:BINTARGETS=efivar} \
 	%{!?with_static_libs:STATICLIBTARGETS=} \
 	libdir=%{_libdir}
@@ -106,10 +107,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %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)