SPECS (LINUX_2_6_22): kernel.spec - added %{subname} to kernel_rel...

[hawk]

Author: hawk                         Date: Wed Jan  2 17:07:25 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_22
---- Log message:
- added %{subname} to kernel_release to allow simultaneous installation
  of normal and grsecurity kernel (there was conflict on
  /lib/modules/%{version}-%{release})
- release 3 to rebuild, but keep in mind that previous release was not
 integer due to adding lustre support which is still NFY/not tested)

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1796.2.35 -> 1.441.2.1796.2.36) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1796.2.35 SPECS/kernel.spec:1.441.2.1796.2.36
--- SPECS/kernel.spec:1.441.2.1796.2.35	Mon Dec 31 16:27:39 2007
+++ SPECS/kernel.spec	Wed Jan  2 18:07:19 2008
@@ -121,7 +121,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			2.2
+%define		_rel			3
 %define		subname			%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}
 
 %define		_netfilter_snap		20070806
@@ -491,7 +491,7 @@
 # modules will be looked from /lib/modules/%{kernel_release}
 # _localversion is just that without version for "> localversion"
 %define		_localversion %{release}
-%define		kernel_release %{version}-%{_localversion}
+%define		kernel_release %{version}%{subname}-%{_localversion}
 %define		_kernelsrcdir	/usr/src/linux%{subname}-%{version}
 
 %if "%{_target_base_arch}" != "%{_arch}"
@@ -1059,7 +1059,7 @@
 %endif
 
 # Fix EXTRAVERSION in main Makefile
-sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}#g' Makefile
+sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}%{subname}#g' Makefile
 
 # on sparc this line causes CONFIG_INPUT=m (instead of =y), thus breaking build
 sed -i -e '/select INPUT/d' net/bluetooth/hidp/Kconfig
@@ -1741,6 +1741,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1796.2.36  2008-01-02 17:07:19  hawk
+- added %{subname} to kernel_release to allow simultaneous installation
+  of normal and grsecurity kernel (there was conflict on
+  /lib/modules/%{version}-%{release})
+- release 3 to rebuild, but keep in mind that previous release was not
+ integer due to adding lustre support which is still NFY/not tested)
+
 Revision 1.441.2.1796.2.35  2007-12-31 15:27:39  matkor
 - Release 2.2. bconded lustre added.
 
================================================================

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