SPECS (LINUX_2_6): kernel.spec /- adapter

glen glen at pld-linux.org
Thu Nov 13 19:13:32 CET 2008


Author: glen                         Date: Thu Nov 13 18:13:32 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
/- adapter

---- Files affected:
SPECS:
   kernel.spec (1.441.2.2007 -> 1.441.2.2008) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.2007 SPECS/kernel.spec:1.441.2.2008
--- SPECS/kernel.spec:1.441.2.2007	Mon Nov 10 02:12:08 2008
+++ SPECS/kernel.spec	Thu Nov 13 19:13:24 2008
@@ -344,14 +344,15 @@
 %ifarch ppc
 BuildRequires:	uboot-mkimage
 %endif
+AutoReqProv:	no
 BuildRequires:	/sbin/depmod
 BuildRequires:	gcc >= 5:3.2
 %{?with_rescuecd:BuildRequires:	lzma >= 1:4.42.2}
 # for hostname command
 BuildRequires:	net-tools
 BuildRequires:	perl-base
+BuildRequires:	rpm-build >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.217
-Autoreqprov:	no
 Requires(post):	coreutils
 Requires(post):	geninitrd >= 2.57
 Requires(post):	module-init-tools >= 0.9.9
@@ -364,6 +365,7 @@
 %if %{with xen0} || %{with xenU}
 Provides:	kernel(xen) = %{_xen_version}
 %endif
+Obsoletes:	kernel%{_alt_kernel}-isdn-mISDN
 Obsoletes:	kernel-misc-acer_acpi
 Obsoletes:	kernel-misc-fuse
 Obsoletes:	kernel-misc-uvc
@@ -374,7 +376,6 @@
 Obsoletes:	kernel-net-ipp2p
 Obsoletes:	kernel-net-rt61
 Obsoletes:	kernel-smp
-Obsoletes:	kernel%{_alt_kernel}-isdn-mISDN
 Conflicts:	e2fsprogs < 1.29
 Conflicts:	isdn4k-utils < 3.1pre1
 Conflicts:	jfsutils < 1.1.3
@@ -1096,9 +1097,9 @@
 		%{SOURCE45} \
 		%{SOURCE50} \
   %else
-    %if %{with grsec_minimal}
+	%if %{with grsec_minimal}
 		%{SOURCE51} \
-    %endif
+	%endif
   %endif
   %if %{with pax}
 		%{SOURCE49} \
@@ -1656,6 +1657,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.2008  2008/11/13 18:13:24  glen
+/- adapter
+
 Revision 1.441.2.2007  2008/11/10 01:12:08  glen
 - add modules.*.bin ghosts
 
================================================================

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



More information about the pld-cvs-commit mailing list