SPECS (LINUX_2_6_16): kernel.spec - netfilter provide with alt ker...

[glen]

Author: glen                         Date: Sat Jan 19 16:41:05 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_16
---- Log message:
- netfilter provide with alt kernel support

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1558.2.124 -> 1.441.2.1558.2.125) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1558.2.124 SPECS/kernel.spec:1.441.2.1558.2.125
--- SPECS/kernel.spec:1.441.2.1558.2.124	Sat Jan 19 17:32:46 2008
+++ SPECS/kernel.spec	Sat Jan 19 17:40:59 2008
@@ -128,13 +128,13 @@
 
 %define		_basever	2.6.16
 %define		_postver	.59
-%define		_rel		1
-%define		_subname	%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
+%define		_rel		2
+%define		subname	%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 Summary:	The Linux kernel (the core of the Linux operating system)
 Summary(de.UTF-8):	Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(fr.UTF-8):	Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl.UTF-8):	J??dro Linuksa
-Name:		kernel%{_subname}
+Name:		kernel%{subname}
 Version:	%{_basever}%{_postver}
 Release:	%{_rel}%{?with_ext2compiled:ext2}
 Epoch:		3
@@ -339,7 +339,7 @@
 Requires:	geninitrd >= 2.57
 Requires:	module-init-tools >= 0.9.9
 Provides:	%{name}-up = %{epoch}:%{version}-%{release}
-Provides:	kernel(netfilter) = %{netfilter_snap}
+Provides:	kernel%{subname}(netfilter) = %{netfilter_snap}
 %if %{with xen0}
 Provides:	kernel(xen0) = %{xen_version}
 %endif
@@ -389,7 +389,7 @@
 # _localversion is just that without version for "> localversion"
 %define		_localversion %{release}%{xen}
 %define		kernel_release %{version}-%{_localversion}
-%define		_kernelsrcdir	/usr/src/linux%{_subname}-%{version}
+%define		_kernelsrcdir	/usr/src/linux%{subname}-%{version}
 
 %if "%{_target_base_arch}" != "%{_arch}"
 	%define	CrossOpts ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
@@ -528,7 +528,7 @@
 Requires:	coreutils
 Requires:	geninitrd >= 2.26
 Requires:	module-init-tools >= 0.9.9
-Provides:	kernel(netfilter) = %{netfilter_snap}
+Provides:	kernel%{subname}(netfilter) = %{netfilter_snap}
 %if %{with xen0}
 Provides:	kernel(xen0) = %{xen_version}
 %endif
@@ -1405,14 +1405,13 @@
 %depmod %{kernel_release}smp
 
 %post headers
-rm -f %{_prefix}/src/linux%{_subname}
-ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{_subname}
+ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{subname}
 
 %postun headers
 if [ "$1" = "0" ]; then
-	if [ -L %{_prefix}/src/linux%{_subname} ]; then
-		if [ "$(readlink %{_prefix}/src/linux%{_subname})" = "linux%{_subname}-%{version}" ]; then
-			rm -f %{_prefix}/src/linux%{_subname}
+	if [ -L %{_prefix}/src/linux%{subname} ]; then
+		if [ "$(readlink %{_prefix}/src/linux%{subname})" = "linux%{subname}-%{version}" ]; then
+			rm -f %{_prefix}/src/linux%{subname}
 		fi
 	fi
 fi
@@ -1738,6 +1737,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1558.2.125  2008-01-19 16:40:59  glen
+- netfilter provide with alt kernel support
+
 Revision 1.441.2.1558.2.124  2008-01-19 16:32:46  glen
 - no manual removal needed, %ghost does that
 
================================================================

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