SPECS (LINUX_2_6): kernel.spec - added %{subname} to kernel_releas...

[hawk]

Author: hawk                         Date: Fri Jan  4 00:33:36 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- added %{subname} to kernel_release to allow simultaneous installation
  of normal and grsecurity kernel (there was conflict on
  /lib/modules/%{version}-%{release})

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1813 -> 1.441.2.1814) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1813 SPECS/kernel.spec:1.441.2.1814
--- SPECS/kernel.spec:1.441.2.1813	Wed Dec 12 12:42:21 2007
+++ SPECS/kernel.spec	Fri Jan  4 01:33:30 2008
@@ -442,7 +442,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}"
@@ -980,7 +980,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
@@ -1669,6 +1669,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1814  2008-01-04 00:33:30  hawk
+- added %{subname} to kernel_release to allow simultaneous installation
+  of normal and grsecurity kernel (there was conflict on
+  /lib/modules/%{version}-%{release})
+
 Revision 1.441.2.1813  2007-12-12 11:42:21  glen
 - add kernel-modpost_warn.patch
 
================================================================

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