SPECS (LINUX_2_6): kernel.spec - use patch for 2.6.X.* releases

[sparky]

Author: sparky                       Date: Wed Jun 21 14:30:58 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- use patch for 2.6.X.* releases

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1560 -> 1.441.2.1561) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1560 SPECS/kernel.spec:1.441.2.1561
--- SPECS/kernel.spec:1.441.2.1560	Wed Jun 21 11:31:02 2006
+++ SPECS/kernel.spec	Wed Jun 21 16:30:52 2006
@@ -105,9 +105,10 @@
 Summary(fr):	Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl):	Jądro Linuksa
 Name:		kernel%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
-#define		_postver	.20
+%define		_basever	2.6.17
 %define		_postver	.1
-Version:	2.6.17%{_postver}
+#define		_postver	%{nil}
+Version:	%{_basever}%{_postver}
 Release:	%{_rel}
 Epoch:		3
 License:	GPL v2
@@ -115,12 +116,14 @@
 %define		_rc	%{nil}
 #define		_rc	-rc5
 #Source0:	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{version}%{_rc}.tar.bz2
-Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{version}%{_rc}.tar.bz2
-# Source0-md5:	0a8f1a66646bc6ac7b3ec3e8f51652a0
-Source1:	kernel-autoconf.h
-Source2:	kernel-config.h
-#Source3:	http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.14%{_rc}-git2.bz2
-## Source3-md5:	3db58f38e8a3c001d1a18eb1ee27db3b
+Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}%{_rc}.tar.bz2
+# Source0-md5:	37ddefe96625502161f075b9d907f21e
+%if "%{_postver}" != "%{nil}"
+Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
+# Source1-md5:	f7197c29beb5bd28b6f566b58260ece8
+%endif
+Source3:	kernel-autoconf.h
+Source4:	kernel-config.h
 Source5:	kernel-ppclibs.Makefile
 Source7:	kernel-module-build.pl
 
@@ -676,12 +679,16 @@
 /usr/src/linux/Documentation.
 
 %prep
-%setup -q -n linux-%{version}%{_rc} -a10
+%setup -q -n linux-%{_basever}%{_rc} -a10
 
 %ifarch ppc
 install %{SOURCE5} Makefile.ppclibs
 %endif
 
+%if "%{_postver}" != "%{nil}"
+%{__bzip2} -dc %{SOURCE1} | patch -p1 -s
+%endif
+
 %patch1 -p1
 
 for i in suspend2-%{suspend_version}-for-2.6.16.9/[0-9]*; do
@@ -1117,8 +1124,8 @@
 
 %{__make} $CrossOpts mrproper
 %{__make} $CrossOpts include/linux/version.h
-install %{SOURCE1} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/include/linux/autoconf.h
-install %{SOURCE2} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/include/linux/config.h
+install %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/include/linux/autoconf.h
+install %{SOURCE4} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}/include/linux/config.h
 
 # collect module-build files and directories
 perl %{SOURCE7} %{_prefix}/src/linux-%{version} $KERNEL_BUILD_DIR
@@ -1602,6 +1609,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1561  2006/06/21 14:30:52  sparky
+- use patch for 2.6.X.* releases
+
 Revision 1.441.2.1560  2006/06/21 09:31:02  hawk
 - 2.6.17.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1560&r2=1.441.2.1561&f=u