SPECS (LINUX_2_6): kernel.spec - let's play, 2.6.23-rc9; 2.6.22 no...

[zbyniu]

Author: zbyniu                       Date: Tue Oct  9 13:11:46 2007 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- let's play, 2.6.23-rc9; 2.6.22 now on LINUX_2_6_22 branch

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796 -> 1.441.2.1797) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796 SPECS/kernel.spec:1.441.2.1797
--- SPECS/kernel.spec:1.441.2.1796	Mon Oct  8 13:37:31 2007
+++ SPECS/kernel.spec	Tue Oct  9 15:11:40 2007
@@ -112,12 +112,12 @@
 %define		_udev_ver		071
 %define		_mkvmlinuz_ver		1.3
 
-%define		_basever		2.6.22
-%define		_postver		.9
+%define		_basever		2.6.23
+%define		_postver		%{nil}
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
-%define		_rc			%{nil}
-%define		_rel			3
+%define		_rc			-rc9
+%define		_rel			0.1
 %define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 
 %define		_netfilter_snap		20070806
@@ -153,9 +153,9 @@
 Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
-#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-%{_basever}%{_rc}.tar.bz2
-# Source0-md5:	2e230d005c002fb3d38a3ca07c0200d0
+Source0:	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{version}%{_rc}.tar.bz2
+# Source0-md5:	8a9fe0003b2bbeb8bd8418686f01e7a9
+#Source0:	http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}%{_rc}.tar.bz2
 %if "%{_prepatch}" != "%{nil}"
 Source90:	http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-%{_prepatch}-%{_pre_rc}.bz2
 # Source90-md5:	b78873f8a3aff5bdc719fc7fb4c66a9b
@@ -172,7 +172,7 @@
 
 # TODO - cleanup
 Source14:	http://ace-host.stuart.id.au/russell/files/debian/sarge/kernel-patch-linuxabi/kernel-patch-linuxabi_20060404.tar.gz
-# Source14-md5:	f2563a2d748c7480559e8d3ff77eb18a
+# Source14-md5:	5c96899f30a0bdd5ff044ac58e3d4b24
 
 Source20:	kernel-i386.config
 Source21:	kernel-x86_64.config
@@ -218,7 +218,7 @@
 
 # Squashfs from squashfs: http://mesh.dl.sourceforge.net/sourceforge/squashfs/squashfs3.2-r2.tar.gz for linux-2.6.20
 Patch6:		squashfs%{squashfs_version}-patch
-Patch7:		linux-alpha-isa.patch
+#Patch7:		linux-alpha-isa.patch # in sources
 Patch8:		linux-fbcon-margins.patch
 Patch9:		linux-static-dev.patch
 
@@ -287,6 +287,7 @@
 
 # Derived from http://www.skd.de/e_en/products/adapters/pci_64/sk-98xx_v20/software/linux/driver/install-8_41.tar.bz2
 Patch60:	linux-2.6-sk98lin_v10.0.4.3.patch
+# potrzebuje modyfikacji, ale jest zbyt rano
 
 # http://www.tuxonice.net/downloads/all/suspend2-2.2.10-for-2.6.22.patch.bz2
 Patch69:	linux-2.6-suspend2.patch
@@ -298,11 +299,6 @@
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:	hostap-kernel-2.6.18.patch
 
-# http://client.linux-nfs.org/Linux-2.6.x/2.6.22/linux-2.6.22-NFS_ALL.dif
-Patch90:	linux-2.6.22-NFS_ALL.dif
-# http://www.citi.umich.edu/projects/nfsv4/linux/kernel-patches/2.6.22-rc5-1/linux-2.6.22-rc5-CITI_NFS4_ALL-1.diff
-Patch91:	linux-2.6.22-rc5-CITI_NFS4_ALL-1.diff
-
 # based on http://vserver.13thfloor.at/Experimental/patch-2.6.22.9-vs2.3.0.26.diff
 Patch100:	linux-2.6-vs2.3.patch
 Patch101:	linux-2.6-vs2.1-suspend2.patch
@@ -320,7 +316,7 @@
 # Fix verified for that kernel version.
 Patch130:	linux-2.6-forcedeth-WON.patch
 
-# http://download.filesystems.org/unionfs/unionfs-2.1/unionfs-2.1.4_for_2.6.22.6.diff.gz
+# http://download.filesystems.org/unionfs/unionfs-2.1/unionfs-2.1.1_for_2.6.23-rc3.diff.gz
 Patch140:	linux-2.6-unionfs-2.1.1.patch
 Patch141:	kernel-unionfs-vserver.patch
 
@@ -775,9 +771,9 @@
 %endif
 
 # squashfs
-%patch6 -p1
+#patch6 -p1 # broken
 
-%patch7 -p1
+#patch7 -p1
 %patch9 -p1
 
 ## netfilter
@@ -873,15 +869,11 @@
 %patch58 -p1
 
 # linux-2.6-sk98lin_v10.0.4.3.patch
-%patch60 -p1
+#patch60 -p1
 
 # hostap enhancements from/for aircrack-ng
 %patch85 -p1
 
-# NFS fixes and NFS4 improvements
-%patch90 -p1
-%patch91 -p1
-
 # vserver
 %if %{with vserver}
 %if %{with vs22}
@@ -1660,6 +1652,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1797  2007/10/09 13:11:40  zbyniu
+- let's play, 2.6.23-rc9; 2.6.22 now on LINUX_2_6_22 branch
+
 Revision 1.441.2.1796  2007/10/08 11:37:31  zbyniu
 - rel 3
 
================================================================

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