From 084ee5f2e655ebe417266ad51483a520fafd1347 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Jun 30 2016 15:05:07 +0000
Subject: Update to 0.24


Signed-off-by: Peter Jones <pjones@redhat.com>

---

diff --git a/.gitignore b/.gitignore
index f930f0c..f5e4df1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *.tar.*
 clog
 *.rpm
+efivar-*/
+bodhi.template
diff --git a/0001-Workaround-rename-of-linux-nvme.h.patch b/0001-Workaround-rename-of-linux-nvme.h.patch
deleted file mode 100644
index 1cd8473..0000000
--- a/0001-Workaround-rename-of-linux-nvme.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3a0ae7189fe96355d64dc2daf91cf85282773c66 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 14 Jan 2016 17:02:31 -0500
-Subject: [PATCH] Workaround rename of linux/nvme.h
-
-Bug: https://bugs.gentoo.org/571548
----
- src/linux.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/linux.c b/src/linux.c
-index b618cfd..9388cd3 100644
---- a/src/linux.c
-+++ b/src/linux.c
-@@ -22,7 +22,12 @@
- #include <inttypes.h>
- #include <limits.h>
- #include <linux/ethtool.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)
-+#include <linux/nvme_ioctl.h>
-+#else
- #include <linux/nvme.h>
-+#endif
- #include <linux/sockios.h>
- #include <net/if.h>
- #include <scsi/scsi.h>
--- 
-2.5.0
-
diff --git a/efivar.spec b/efivar.spec
index 34e1e1d..1eee242 100644
--- a/efivar.spec
+++ b/efivar.spec
@@ -1,5 +1,5 @@
 Name:           efivar
-Version:        0.23
+Version:        0.24
 Release:        1%{?dist}
 Summary:        Tools to manage UEFI variables
 License:        LGPLv2.1
@@ -9,7 +9,6 @@ ExclusiveArch:	%{ix86} x86_64 aarch64
 
 BuildRequires:  popt-devel popt-static git glibc-static
 Source0:        https://github.com/rhinstaller/efivar/releases/download/efivar-%{version}/efivar-%{version}.tar.bz2
-Patch0001:	0001-Workaround-rename-of-linux-nvme.h.patch
 
 %description
 efivar provides a simple command line interface to the UEFI variable facility.
@@ -39,7 +38,7 @@ git config --unset user.email
 git config --unset user.name
 
 %build
-make libdir=%{_libdir} bindir=%{_bindir} OPT_FLAGS="$RPM_OPT_FLAGS"
+make libdir=%{_libdir} bindir=%{_bindir} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -70,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 
 %changelog
+* Thu Jun 30 2016 Peter Jones <pjones@redhat.com> - 0.24-1
+- Update to 0.24
+
 * Mon Feb 15 2016 Peter Jones <pjones@redhat.com> - 0.23-1
 - Update to 0.23
 
diff --git a/sources b/sources
index 222e16c..68641e3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-7aa910eb493e3758b023fac3fdf7bd83  efivar-0.21.tar.bz2
-81aa1f31e05aec95e30d2b4c6042d289  efivar-0.22.tar.bz2
-bff7aa95fdb2f5d79f4aa9721dca2bbd  efivar-0.23.tar.bz2
+38b6912e870e8a735e3a488e8e62d348  efivar-0.24.tar.bz2