From dd04335dfc420db89853d2fe23ca6a56c338cd10 Mon Sep 17 00:00:00 2001
From: Evgenii Shatokhin <eugene.shatokhin@rosalab.ru>
Date: Mon, 10 Sep 2018 11:27:56 +0300
Subject: [PATCH] Update to v35 again

---
 .abf.yml    |  2 +-
 efivar.spec | 64 +++++++++++++++++++++++++++++++++--------------------
 2 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index a0a6b56..f95185e 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  0.15.tar.gz: dd4170e4b19d32dff14fa53f0bfe4daffff230b2
+  efivar-35.tar.bz2: 4825d453a9ae810bc61c5bcbf3a12e4ad64d7487
diff --git a/efivar.spec b/efivar.spec
index 5b8be0a..2e82f43 100644
--- a/efivar.spec
+++ b/efivar.spec
@@ -1,30 +1,44 @@
-%define major           0
+%define major           1
 %define libname         %mklibname %{name} %{major}
 %define develname       %mklibname -d %{name}
 
 Name:           efivar
-Version:        0.15
-Release:        5
+Version:        35
+Release:        2
 Epoch:          1
 Summary:        Tools to manage UEFI variables
 License:        LGPLv2.1
 Group:          System/Kernel and hardware
-URL:            https://github.com/vathpela/efivar
-Source0:        https://github.com/vathpela/%{name}/archive/%{version}.tar.gz
+URL:            https://github.com/rhboot/efivar
+Source0:        https://github.com/rhboot/%{name}/releases/download/%{version}/efivar-%{version}.tar.bz2
 
 Requires:       %{libname} = %{EVRD}
-BuildRequires:  popt-devel
+
+BuildRequires:  pkgconfig(popt)
+BuildRequires:  glibc-static-devel
 
 %description
 efivar provides a simple command line interface to the UEFI variable facility.
 
+%files
+%doc COPYING README.md
+%{_bindir}/efivar
+%{_mandir}/man1/*
+
+#---------------------------------------------------------------------------
+
 %package -n %{libname}
-Summary:        Library for the %name
+Summary:        Library to manage UEFI variables
 Group:          System/Libraries
 
 %description -n %{libname}
 Library to allow for the simple manipulation of UEFI variables.
 
+%files -n %{libname}
+%{_libdir}/*.so.%{major}*
+
+#---------------------------------------------------------------------------
+
 %package -n %{develname}
 Summary:        Development files for %{name}
 Group:          Development/C
@@ -32,28 +46,30 @@ Requires:       %{libname} = %{EVRD}
 Provides:       %{name}-devel = %{EVRD}
 
 %description -n %{develname}
-The %{name}-devel package contains libraries and header files for
+%{develname} contains libraries and header files for
 developing applications that use %{name}.
 
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-make libdir=%{_libdir} bindir=%{_bindir} OPT_FLAGS="$RPM_OPT_FLAGS"
-
-%install
-%makeinstall
-
-%files
-%doc COPYING README
-%{_bindir}/efivar
-%{_mandir}/man1/*
-
 %files -n %{develname}
 %{_mandir}/man3/*
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
-%files -n %{libname}
-%{_libdir}/*.so.%{major}*
+#---------------------------------------------------------------------------
+
+%prep
+%setup -q -n %{name}-%{version}
+
+
+%build
+make \
+  libdir=%{_libdir} \
+  bindir=%{_bindir} \
+  CFLAGS="$RPM_OPT_FLAGS -Wstrict-aliasing=3 -flto" \
+  LDFLAGS="$RPM_LD_FLAGS -flto"
+
+# -Wstring-aliasing=3 enables slower but more accurate detection of
+# aliasing issues than level 2 used by default, less false positives.
+
+%install
+%makeinstall