SPECS: kernel24.spec - updated patch to 2.4.33.4 (using official o...

[qboosh]

Author: qboosh                       Date: Thu Nov 23 09:30:46 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated patch to 2.4.33.4 (using official one instead of extracted update patch)
- updated cryptoloop-jari,i2c,grsecurity,EXPORT_SYMBOL patches
- switched to new versioning scheme (testing in progress, release 0.1)

---- Files affected:
SPECS:
   kernel24.spec (1.780 -> 1.781) 

---- Diffs:

================================================================
Index: SPECS/kernel24.spec
diff -u SPECS/kernel24.spec:1.780 SPECS/kernel24.spec:1.781
--- SPECS/kernel24.spec:1.780	Mon Nov 13 16:00:11 2006
+++ SPECS/kernel24.spec	Thu Nov 23 10:30:41 2006
@@ -32,11 +32,13 @@
 Summary(pl):	Jądro Linuksa
 Summary(pt_BR):	Kernel Linux (a parte central do sistema operacional Linux)
 Name:		kernel24
-Version:	2.4.33
-Release:	2%{?with_um:um}
+%define	basever	2.4.33
+%define	postver	.4
+Version:	%{basever}%{postver}
+Release:	0.1%{?with_um:um}
 License:	GPL v2
 Group:		Base/Kernel
-Source0:	ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-%{version}.tar.bz2
+Source0:	ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-%{basever}.tar.bz2
 # Source0-md5:	807eee53a4270659d568a542c4d08ea3
 Source1:	%{name}-autoconf.h
 Source2:	%{name}-BuildASM.sh
@@ -46,6 +48,8 @@
 # Source4-md5:	f3b96692f679239488de30f2bd896825
 # 2.4.26 contains jfs with more recent fixes
 #Source7:	http://www10.software.ibm.com/developer/opensource/jfs/project/pub/jfs-2.4-1.1.5.tar.gz
+Source10:	ftp://ftp.kernel.org/pub/linux/kernel/v2.4/patch-%{version}.bz2
+# Source10-md5:	6dddbeea9274f87ed9d4f7b87882ad91
 Source20:	%{name}-ia32.config
 Source21:	%{name}-ia32-smp.config
 Source30:	%{name}-amd64.config
@@ -96,8 +100,6 @@
 Patch26:	linux-2.4-libata-update.patch
 # backports from 2.6.18-rc4
 Patch27:	linux-2.4-ide-update.patch
-# 2.4.33.1
-Patch28:	linux-2.4-update.patch
 
 # New filesystems
 
@@ -754,7 +756,8 @@
 Este pacote contém documentaçăo para o kernel Linux.
 
 %prep
-%setup -q -n linux-%{version} -a3 -a4
+%setup -q -n linux-%{basever} -a3 -a4
+%{__bzip2} -dc %{SOURCE10} | patch -s -p1
 #%patch0 -p1
 #%patch1 -p1
 #%patch2 -p1
@@ -772,7 +775,6 @@
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
-%patch28 -p1
 %patch31 -p1
 %patch32 -p1
 #%patch33 -p1
@@ -941,7 +943,7 @@
 echo -e ',s/EXTRA_CFLAGS.*-g//g\n,w' | ed net/ipsec/Makefile
 
 # Fix EXTRAVERSION and CC in main Makefile
-echo -e ',s/EXTRAVERSION =.*/EXTRAVERSION = -%{release}/g\n,w' | ed Makefile
+echo -e ',s/EXTRAVERSION =.*/EXTRAVERSION = %{postver}-%{release}/g\n,w' | ed Makefile
 %ifarch %{ix86} %{x8664} alpha sparc ppc
 echo -e ',s#CC.*$(CROSS_COMPILE)gcc#CC            = %{__cc}#g\n,w' | ed Makefile
 %endif
@@ -989,7 +991,7 @@
 	[ "$1" = "BOOT" -o "$2" = "BOOT" ] && BOOT=yes
 	[ "$1" = "smp" -o "$2" = "smp" ] && smp=yes
 	# Fix EXTRAVERSION in main Makefile
-	echo -e ",s/EXTRAVERSION =.*/EXTRAVERSION = -%{release}$1/g\n,w" | ed Makefile
+	echo -e ",s/EXTRAVERSION =.*/EXTRAVERSION = %{postver}-%{release}$1/g\n,w" | ed Makefile
 %if %{with um}
 	if [ "$smp" = "yes" ]; then
 		Config="um-smp"
@@ -1209,7 +1211,7 @@
 done
 ln -sf linux-%{version} $RPM_BUILD_ROOT%{_prefix}/src/linux-2.4
 
-echo -e ',s/EXTRAVERSION =.*/EXTRAVERSION = -%{release}/g\n,w' | ed Makefile
+echo -e ',s/EXTRAVERSION =.*/EXTRAVERSION = %{postver}-%{release}/g\n,w' | ed Makefile
 %if %{with source}
 cp -a . $RPM_BUILD_ROOT%{_prefix}/src/linux-%{version}
 %else
@@ -1714,6 +1716,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.781  2006/11/23 09:30:41  qboosh
+- updated patch to 2.4.33.4 (using official one instead of extracted update patch)
+- updated cryptoloop-jari,i2c,grsecurity,EXPORT_SYMBOL patches
+- switched to new versioning scheme (testing in progress, release 0.1)
+
 Revision 1.780  2006/11/13 15:00:11  sparky
 - don't use %{without ...}, it may not work after inverting bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel24.spec?r1=1.780&r2=1.781&f=u