From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 19 Apr 2015 14:18:57 +0000 (+0200)
Subject: - updated to 0.11.0
X-Git-Tag: auto/th/efibootmgr-0.11.0-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=62ac90206c0a888a5d6e6af054104b0dfbe7258c;p=packages%2Fefibootmgr.git

- updated to 0.11.0
- added efivar patch to resolve conflicts with efivar 0.16+
---

diff --git a/efibootmgr-efivar.patch b/efibootmgr-efivar.patch
new file mode 100644
index 0000000..3272494
--- /dev/null
+++ b/efibootmgr-efivar.patch
@@ -0,0 +1,23 @@
+--- efibootmgr-efibootmgr-0.11.0/src/include/efi.h.orig	2014-10-21 22:17:27.000000000 +0200
++++ efibootmgr-efibootmgr-0.11.0/src/include/efi.h	2015-04-19 16:00:26.075721399 +0200
+@@ -43,8 +43,10 @@
+ EFI_GUID( 0x09576e91, 0x6d3f, 0x11d2, 0x8e39, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
+ #define EFI_GLOBAL_VARIABLE \
+ EFI_GUID( 0x8BE4DF61, 0x93CA, 0x11d2, 0xAA0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C)
++#ifndef EDD10_HARDWARE_VENDOR_PATH_GUID
+ #define EDD10_HARDWARE_VENDOR_PATH_GUID \
+ EFI_GUID( 0xCF31FAC5, 0xC24E, 0x11d2, 0x85F3, 0x00, 0xA0, 0xC9, 0x3E, 0xC9, 0x3B)
++#endif
+ #define BLKX_UNKNOWN_GUID \
+ EFI_GUID( 0x47c7b225, 0xc42a, 0x11d2, 0x8e57, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b)
+ #define DIR_UNKNOWN_GUID \
+--- efibootmgr-efibootmgr-0.11.0/src/efibootmgr/efibootmgr.c.orig	2014-10-21 22:17:27.000000000 +0200
++++ efibootmgr-efibootmgr-0.11.0/src/efibootmgr/efibootmgr.c	2015-04-19 16:13:25.519038487 +0200
+@@ -59,6 +59,7 @@
+ #define EFIBOOTMGR_VERSION "unknown (fix Makefile!)"
+ #endif
+ 
++#define efi_variable_t my_efi_variable_t
+ 
+ typedef struct _var_entry {
+ 	char		*name;
diff --git a/efibootmgr.spec b/efibootmgr.spec
index 1e53c22..f057b69 100644
--- a/efibootmgr.spec
+++ b/efibootmgr.spec
@@ -1,13 +1,16 @@
 Summary:	EFI Boot Manager
 Summary(pl.UTF-8):	Boot Manager dla EFI
 Name:		efibootmgr
-Version:	0.6.0
+Version:	0.11.0
 Release:	1
 License:	GPL v2+
 Group:		Base
-Source0:	http://linux.dell.com/efibootmgr/permalink/%{name}-%{version}.tar.gz
-# Source0-md5:	9e9a31d79e579644de83a14139b66d10
+#Source0:	http://linux.dell.com/efibootmgr/permalink/%{name}-%{version}.tar.gz
+Source0:	https://github.com/rhinstaller/efibootmgr/archive/%{name}-%{version}.tar.gz
+# Source0-md5:	3732e841bb644df71500971910420267
+Patch0:		%{name}-efivar.patch
 URL:		http://linux.dell.com/projects.shtml#efibootmgr
+BuildRequires:	efivar-devel
 BuildRequires:	pciutils-devel
 ExclusiveArch:	%{ix86} %{x8664} ia64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -25,12 +28,13 @@ można znaleźć pod adresem
 <http://developer.intel.com/technology/efi/efi.htm>.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{name}-%{version}
+%patch0 -p1
 
 %build
 %{__make} \
 	CC="%{__cc}" \
-	EXTRA_CFLAGS="%{rpmcflags}" \
+	EXTRA_CFLAGS="%{rpmcflags} -I/usr/include/efivar" \
 	VPATH=%{_libdir}
 
 %install