packages: grub2/grub2.spec - rel 4; update deps, flags and not working bconds

[arekm]

Author: arekm                        Date: Tue Sep 20 06:57:03 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; update deps, flags and not working bconds

---- Files affected:
packages/grub2:
   grub2.spec (1.104 -> 1.105) 

---- Diffs:

================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.104 packages/grub2/grub2.spec:1.105
--- packages/grub2/grub2.spec:1.104	Tue Sep 20 00:01:41 2011
+++ packages/grub2/grub2.spec	Tue Sep 20 08:56:58 2011
@@ -13,7 +13,6 @@
 #   /etc/bash_completion.d/grub
 #
 # Conditional build:
-%bcond_with	static	# build static binaries
 %bcond_with		grubemu	# build grub-emu debugging utility
 %bcond_without	efiemu	# build efiemu runtimes
 
@@ -35,7 +34,7 @@
 Summary(pt_BR.UTF-8):	Gerenciador de inicialização GRUB2
 Name:		grub2
 Version:	1.99
-Release:	3
+Release:	4
 License:	GPL v2
 Group:		Base
 Source0:	http://ftp.gnu.org/gnu/grub/grub-%{version}.tar.xz
@@ -63,9 +62,6 @@
 BuildRequires:	help2man
 BuildRequires:	libtool
 BuildRequires:	texinfo
-%ifarch %{ix86} %{x8664}
-BuildRequires:	lzo-devel >= 1.0.2
-%endif
 %ifarch %{x8664}
 BuildRequires:	/usr/lib/libc.so
 %if "%{pld_release}" == "ac"
@@ -73,16 +69,9 @@
 %else
 BuildRequires:	gcc-multilib
 %endif
-%endif
 BuildRequires:	ncurses-devel
 BuildRequires:	sed >= 4.0
-%if %{with static}
 BuildRequires:	glibc-static
-%ifarch %{ix86} %{x8664}
-BuildRequires:	lzo-static
-%endif
-BuildRequires:	ncurses-static
-%endif
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.213
 Requires:	which
@@ -212,7 +201,7 @@
 %{__autoheader}
 echo timestamp > stamp-h.in
 %{__autoconf}
-export CFLAGS="-Os %{?debug:-g}"
+export CFLAGS="%{rpmcflags} -Os %{?debug:-g}"
 
 # mawk stalls at ./genmoddep.awk, so force gawk
 AWK=gawk \
@@ -224,20 +213,9 @@
 	--enable-grub-emu-pci \
 %endif
 	--%{!?with_efiemu:dis}%{?with_efiemu:en}able-efiemu \
-	BUILD_CFLAGS="$CFLAGS"
-%{__make} -j1 \
-	BUILD_CFLAGS="$CFLAGS" \
-%if %{with static}
-%ifarch %{ix86} %{x8664}
-	grub_setup_LDFLAGS="-s -static" \
-	grub_mkimage_LDFLAGS="-s -static -llzo" \
-%else
-	grub_mkimage_LDFLAGS="-s -static" \
-%endif
-	grub_emu_LDFLAGS="-s -static -lncurses -ltinfo" \
-%endif
-	pkgdatadir=%{_libexecdir} \
-	pkglibdir=%{_libexecdir}
+	TARGET_LDFLAGS=-static
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -395,6 +373,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105  2011/09/20 06:56:58  arekm
+- rel 4; update deps, flags and not working bconds
+
 Revision 1.104  2011/09/19 22:01:41  glen
 - filterout -Wl,--no-copy-dt-needed-entries hack
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/grub2/grub2.spec?r1=1.104&r2=1.105&f=u