SPECS (Titanium): kernel-bare-grsecurity.spec, kernel-bare-vserver.spec - o...

[hawk]

Author: hawk                         Date: Thu May  8 11:45:39 2008 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- original vendor sk98lin driver moved to separate spec
- cleanup

---- Files affected:
SPECS:
   kernel-bare-grsecurity.spec (1.1.2.30 -> 1.1.2.31) , kernel-bare-vserver.spec (1.1.2.32 -> 1.1.2.33) 

---- Diffs:

================================================================
Index: SPECS/kernel-bare-grsecurity.spec
diff -u SPECS/kernel-bare-grsecurity.spec:1.1.2.30 SPECS/kernel-bare-grsecurity.spec:1.1.2.31
--- SPECS/kernel-bare-grsecurity.spec:1.1.2.30	Wed May  7 12:59:50 2008
+++ SPECS/kernel-bare-grsecurity.spec	Thu May  8 13:45:34 2008
@@ -24,18 +24,13 @@
 %define		_postver	.7
 %define		_rel		1
 
-#%define		_ver		2.6.20
-#%define		_rc		rc4
-%define		_ver		%{nil}
-%define		_rc		%{nil}
-
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(fr):	Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl):	Jądro Linuksa
 Name:		kernel-%{alt_kernel}
-Version:	%{?_ver:%{_ver}}%{_basever}%{_postver}
-Release:	%{?_rc:%{_rc}}%{_rel}
+Version:	%{_basever}%{_postver}
+Release:	%{_rel}
 Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
@@ -45,10 +40,6 @@
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{_basever}%{_postver}.bz2
 # Source1-md5:	0c1c5d6d8cd82e18d62406d2f34d1d38
 %endif
-%if "%{_ver}" != "%{nil}"
-Source10:	http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-%{_ver}-%{_rc}.bz2
-# Source10-md5:	9b325c6086ad2a3fcde643f01a4c4640
-%endif
 
 Source2:	kernel-bare-grsecurity-module-build.pl
 Source3:	kernel-bare-grsecurity-config.h
@@ -62,8 +53,6 @@
 Patch100:	linux-2.6-grsecurity.patch
 # from squashfs: http://dl.sourceforge.net/sourceforge/squashfs/squashfs3.3.tar.gz
 Patch101:	linux-2.6.24-squashfs.patch
-# official vendor driver for Marvell Yukon gigabit adapters
-Patch102:	linux-2.6.24-sk98lin.patch
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.14.90.0.7
@@ -362,9 +351,6 @@
 %if "%{_postver}" != "%{nil}"
 %{__bzip2} -dc %{SOURCE1} | %{__patch} -p1 -s
 %endif
-%if "%{_ver}" != "%{nil}"
-%{__bzip2} -dc %{SOURCE10} | %{__patch} -p1 -s
-%endif
 
 %patch100 -p1
 %patch101 -p1
@@ -831,6 +817,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.31  2008-05-08 11:45:34  hawk
+- original vendor sk98lin driver moved to separate spec
+- cleanup
+
 Revision 1.1.2.30  2008-05-07 10:59:50  hawk
 - updated to 2.6.24.7
 

================================================================
Index: SPECS/kernel-bare-vserver.spec
diff -u SPECS/kernel-bare-vserver.spec:1.1.2.32 SPECS/kernel-bare-vserver.spec:1.1.2.33
--- SPECS/kernel-bare-vserver.spec:1.1.2.32	Wed May  7 12:58:09 2008
+++ SPECS/kernel-bare-vserver.spec	Thu May  8 13:45:34 2008
@@ -22,18 +22,13 @@
 %define		_postver	.2
 %define		_rel		1
 
-#%define		_ver		2.6.20
-#%define		_rc		rc4
-%define		_ver		%{nil}
-%define		_rc		%{nil}
-
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(fr):	Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl):	Jądro Linuksa
 Name:		kernel-%{alt_kernel}
-Version:	%{?_ver:%{_ver}}%{_basever}%{_postver}
-Release:	%{?_rc:%{_rc}}%{_rel}
+Version:	%{_basever}%{_postver}
+Release:	%{_rel}
 Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
@@ -43,10 +38,6 @@
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{_basever}%{_postver}.bz2
 # Source1-md5:	c1d1c1542d676ce3143e5713bab2cca4
 %endif
-%if "%{_ver}" != "%{nil}"
-Source10:	http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-%{_ver}-%{_rc}.bz2
-# Source10-md5:	9b325c6086ad2a3fcde643f01a4c4640
-%endif
 
 Source2:	kernel-bare-vserver-module-build.pl
 Source3:	kernel-bare-vserver-config.h
@@ -54,15 +45,12 @@
 Source20:	kernel-bare-vserver-x86.config
 Source21:	kernel-bare-vserver-x86_64.config
 
-
 # from http://vserver.13thfloor.at/Experimental/
 Patch100:	linux-2.6-vs2.3.patch
 # minimal grsecurity for vserver patched kernel
 Patch101:	linux-2.6-grsec-vs-minimal.patch
 # from squashfs: http://dl.sourceforge.net/sourceforge/squashfs/squashfs3.3.tar.gz
 Patch102:	linux-2.6.25-squashfs.patch
-# official vendor driver for Marvell Yukon gigabit adapters
-Patch103:	linux-2.6.25-sk98lin.patch
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.14.90.0.7
@@ -361,9 +349,6 @@
 %if "%{_postver}" != "%{nil}"
 %{__bzip2} -dc %{SOURCE1} | %{__patch} -p1 -s
 %endif
-%if "%{_ver}" != "%{nil}"
-%{__bzip2} -dc %{SOURCE10} | %{__patch} -p1 -s
-%endif
 
 %patch100 -p1
 %patch101 -p1
@@ -815,6 +800,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.33  2008-05-08 11:45:34  hawk
+- original vendor sk98lin driver moved to separate spec
+- cleanup
+
 Revision 1.1.2.32  2008-05-07 10:58:09  hawk
 - updated to 2.6.25.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-bare-grsecurity.spec?r1=1.1.2.30&r2=1.1.2.31&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-bare-vserver.spec?r1=1.1.2.32&r2=1.1.2.33&f=u