packages: grub2/grub2.spec - ac deps; rel 5

[glen]

Author: glen                         Date: Tue Nov 17 17:44:37 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- ac deps; rel 5

---- Files affected:
packages/grub2:
   grub2.spec (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: packages/grub2/grub2.spec
diff -u packages/grub2/grub2.spec:1.67 packages/grub2/grub2.spec:1.68
--- packages/grub2/grub2.spec:1.67	Tue Nov 17 18:37:13 2009
+++ packages/grub2/grub2.spec	Tue Nov 17 18:44:32 2009
@@ -1,19 +1,17 @@
 # $Revision$, $Date$
 # Conditional build:
-%bcond_with	static	# build static binaries
+%bcond_with		static	# build static binaries
 %bcond_without	grubemu	# build grub-emu binary
-#
+
 Summary:	GRand Unified Bootloader
 Summary(de.UTF-8):	GRUB2 - ein Bootloader für x86 und ppc
 Summary(pl.UTF-8):	GRUB2 - bootloader dla x86 i ppc
 Summary(pt_BR.UTF-8):	Gerenciador de inicialização GRUB2
 Name:		grub2
 Version:	1.97.1
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		Base
-# svn export svn://svn.sv.gnu.org/grub/trunk/grub2
-#Source0:	%{name}-%{snap}.tar.bz2
 Source0:	http://alpha.gnu.org/gnu/grub/grub-%{version}.tar.gz
 # Source0-md5:	66fe18cd9318e3d67a34d7b7a8e7b1f6
 Source1:	update-grub
@@ -37,8 +35,12 @@
 %endif
 %ifarch %{x8664}
 BuildRequires:	/usr/lib/libc.so
+%if "%{pld_release}" == "ac"
+BuildRequires:	libgcc32
+%else
 BuildRequires:	gcc-multilib
 %endif
+%endif
 BuildRequires:	ncurses-devel
 BuildRequires:	sed >= 4.0
 %if %{with static}
@@ -48,6 +50,7 @@
 %endif
 BuildRequires:	ncurses-static
 %endif
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.213
 Provides:	bootloader
 Conflicts:	grub
@@ -276,6 +279,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.68  2009/11/17 17:44:32  glen
+- ac deps; rel 5
+
 Revision 1.67  2009/11/17 17:37:13  glen
 - efiemu32.o/efiemu64.o on x86_64 only
 
================================================================

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