Author: zbyniu Date: Fri May 16 09:04:43 2008 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- updated to 2.6.25.4
- tproxy patch depends on vserver, so don't use with rescue kernel
---- Files affected:
SPECS:
kernel.spec (1.441.2.1900 -> 1.441.2.1901)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1900 SPECS/kernel.spec:1.441.2.1901
--- SPECS/kernel.spec:1.441.2.1900 Wed May 14 23:47:32 2008
+++ SPECS/kernel.spec Fri May 16 11:04:37 2008
@@ -109,11 +109,11 @@
%endif
%define _basever 2.6.25
-%define _postver .3
+%define _postver .4
%define _prepatch %{nil}
%define _pre_rc %{nil}
%define _rc %{nil}
-%define _rel 0.4
+%define _rel 0.1
%define _enable_debug_packages 0
@@ -161,7 +161,7 @@
%endif
%if "%{_postver}" != "%{nil}"
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5: 49c56cf1394b2286033bb10c7cef7260
+# Source1-md5: f12f43dd78b765f3d1402aa9d2170cf5
%endif
Source3: kernel-autoconf.h
@@ -206,7 +206,7 @@
# ftp://ftp.openbios.org/pub/bootsplash/kernel/bootsplash-3.1.6-2.6.21.diff.gz
Patch3: linux-2.6-bootsplash.patch
-# based on
http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.24-rc7.patch
+#
http://dev.gentoo.org/~spock/projects/fbcondecor/archive/fbcondecor-0.9.4-2.6.25-rc6.patch
Patch4: kernel-fbcondecor.patch
# based on http://mesh.dl.sourceforge.net/sourceforge/squashfs/squashfs3.3.tgz
@@ -883,7 +883,9 @@
#%endif
# tproxy
+%if %{without rescue}
%patch42 -p1
+%endif
# forcedeth:
%patch130 -p1
@@ -1693,6 +1695,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1901 2008-05-16 09:04:37 zbyniu
+- updated to 2.6.25.4
+- tproxy patch depends on vserver, so don't use with rescue kernel
+
Revision 1.441.2.1900 2008-05-14 21:47:32 dzeus
- added ZPH support (for SQUID3)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.1900&r2=1.441.2.1901&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
