Accepting request 140575 from Base:System

- revert last change as it breaks the app completely

OBS-URL: https://build.opensuse.org/request/show/140575
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnu-efi?expand=0&rev=17

gnu-efi-add-optflags-to-make-defaults.patch

@@ -1,14 +0,0 @@
-Index: gnu-efi-3.0/Make.defaults
-===================================================================
---- gnu-efi-3.0.orig/Make.defaults
-+++ gnu-efi-3.0/Make.defaults
-@@ -48,7 +48,8 @@ ARCH	   := $(shell uname -m | sed s,i[34
- OS	   = $(shell uname -s)
- INCDIR	   = -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) -I$(TOPDIR)/inc/protocol 
- CPPFLAGS   = -DCONFIG_$(ARCH)
--CFLAGS	   = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants
-+OPTFLAGS   = -O2 -g
-+CFLAGS	   = $(ARCH3264) $(OPTFLAGS) -fpic -fshort-wchar -fno-strict-aliasing -fno-merge-constants
- ASFLAGS    = $(ARCH3264)
- LDFLAGS	   = -nostdlib
- INSTALL	   = install

gnu-efi.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov  7 16:22:08 UTC 2012 - dmueller@suse.com
+
+- revert last change as it breaks the app completely
+
 -------------------------------------------------------------------
 Wed Jul 18 15:47:22 UTC 2012 - meissner@suse.com
 

gnu-efi.spec

@@ -20,13 +20,11 @@ Name:           gnu-efi
 Version:        3.0q
 Release:        0
 Summary:        Library for EFI Applications
-License:        BSD-3-Clause ; GPL-2.0+
+License:        BSD-3-Clause and GPL-2.0+
 Group:          Development/Libraries/Other
 Url:            http://sourceforge.net/projects/gnu-efi
 Source:         http://downloads.sourceforge.net/gnu-efi/gnu-efi_3.0q.orig.tar.gz
 Source1:        %{name}-rpmlintrc
-# PATCH-FIX-OPENSUSE gnu-efi-add-optflags-to-make-defaults.patch malcolmlewis@opensuse.org -- Add additional RPM OPT FLAGS to Make.defaults to avoid brp check warning.
-Patch0:         gnu-efi-add-optflags-to-make-defaults.patch
 BuildRequires:  kernel-source
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  ia64 %ix86 x86_64
@@ -43,10 +41,13 @@ Authors:
 
 %prep
 %setup -q -n gnu-efi-3.0
-%patch0 -p1
 
 %build
-make LINUX_HEADERS=/usr/src/linux OPTFLAGS="$RPM_OPT_FLAGS"
+##########################
+## DO NOT ADD RPM OPT FLAGS! THIS DOES NOT BUILD AGAINST GLIBC
+##
+##########################
+make LINUX_HEADERS=/usr/src/linux
 
 %install
 make install INSTALLROOT=%{buildroot}%{_prefix} LIBDIR=%_lib