SPECS: kernel-desktop.spec - play with gcc4 bcond

glen glen at pld-linux.org
Mon Jan 21 21:56:44 CET 2008


Author: glen                         Date: Mon Jan 21 20:56:44 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- play with gcc4 bcond

---- Files affected:
SPECS:
   kernel-desktop.spec (1.151 -> 1.152) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.151 SPECS/kernel-desktop.spec:1.152
--- SPECS/kernel-desktop.spec:1.151	Mon Jan 21 11:07:39 2008
+++ SPECS/kernel-desktop.spec	Mon Jan 21 21:56:38 2008
@@ -234,7 +234,8 @@
 URL:		http://www.kernel.org/
 BuildRequires:	/sbin/depmod
 BuildRequires:	binutils >= 3:2.14.90.0.7
-BuildRequires:	gcc >= 5:3.2
+%{!?with_gcc4:BuildRequires:	gcc >= 5:3.2}
+%{?with_gcc4:BuildRequires:	gcc >= 5:4.1.1}
 BuildRequires:	module-init-tools
 # for hostname command
 BuildRequires:	net-tools
@@ -246,8 +247,8 @@
 Requires:	module-init-tools >= 0.9.9
 %{?with_bootsplash:Suggests:	bootsplash}
 %{?with_fbsplash:Suggests:	splashutils}
-Provides:	kernel(netfilter) = %{netfilter_snap}
 Provides:	%{name}(netfilter) = %{netfilter_snap}
+Provides:	kernel(netfilter) = %{netfilter_snap}
 Conflicts:	e2fsprogs < 1.29
 Conflicts:	isdn4k-utils < 3.1pre1
 Conflicts:	jfsutils < 1.1.3
@@ -1075,6 +1076,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.152  2008-01-21 20:56:38  glen
+- play with gcc4 bcond
+
 Revision 1.151  2008-01-21 10:07:39  glen
 - add gcc4 bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-desktop.spec?r1=1.151&r2=1.152&f=u



More information about the pld-cvs-commit mailing list