SPECS (hawk-LINUX_2_6): kernel.spec - more /usr/src/linux* fixes -...

[hawk]

Author: hawk                         Date: Wed Jan 31 16:33:21 2007 GMT
Module: SPECS                         Tag: hawk-LINUX_2_6
---- Log message:
- more /usr/src/linux* fixes
- release 3

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1701.2.10 -> 1.441.2.1701.2.11) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1701.2.10 SPECS/kernel.spec:1.441.2.1701.2.11
--- SPECS/kernel.spec:1.441.2.1701.2.10	Wed Jan 31 12:32:30 2007
+++ SPECS/kernel.spec	Wed Jan 31 17:33:16 2007
@@ -81,7 +81,7 @@
 
 %define		_basever	2.6.19
 %define		_postver	.2
-%define		_rel		2
+%define		_rel		3
 %define		_rc		%{nil}
 %define		_subname	%{?with_pax:-pax}%{?with_grsec_full:-grsecurity}%{?with_vserver:-vserver}
 Summary:	The Linux kernel (the core of the Linux operating system)
@@ -192,7 +192,7 @@
 # _localversion is just that without version for "> localversion"
 %define		_localversion %{release}
 %define		kernel_release %{version}-%{_localversion}
-%define		_kernelsrcdir	/usr/src/linux-%{version}
+%define		_kernelsrcdir	/usr/src/linux%{_subname}-%{version}
 
 %define	CommonOpts	HOSTCC="%{__cc}" HOSTCFLAGS="-Wall -Wstrict-prototypes %{rpmcflags} -fomit-frame-pointer"
 %if "%{_target_base_arch}" != "%{_arch}"
@@ -1090,14 +1090,14 @@
 %depmod %{kernel_release}smp
 
 %post headers
-rm -f %{_kernelsrcdir}
+rm -f %{_prefix}/src/linux{_subname}
 ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{_subname}
 
 %postun headers
 if [ "$1" = "0" ]; then
-	if [ -L %{_kernelsrcdir} ]; then
-		if [ "$(readlink %{_kernelsrcdir})" = "linux-%{version}" ]; then
-			rm -f %{_kernelsrcdir}
+	if [ -L %{_prefix}/src/linux ]; then
+		if [ "$(readlink %{_prefix}/src/linux%{_subname})" = "linux%{_subname}-%{version}" ]; then
+			rm -f %{_prefix}/src/linux%{_subname}
 		fi
 	fi
 fi
@@ -1387,6 +1387,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1701.2.11  2007/01/31 16:33:16  hawk
+- more /usr/src/linux* fixes
+- release 3
+
 Revision 1.441.2.1701.2.10  2007/01/31 11:32:30  hawk
 - fixed /usr/src/linux-%{version} symlinking
 - release 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1701.2.10&r2=1.441.2.1701.2.11&f=u