SPECS (Titanium): kernel-bare-grsecurity.spec, kernel-bare-vserver...

[hawk]

Author: hawk                         Date: Sun Nov 11 22:19:44 2007 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- reverted adapter stupidity
- release 3

---- Files affected:
SPECS:
   kernel-bare-grsecurity.spec (1.1.2.6 -> 1.1.2.7) , kernel-bare-vserver.spec (1.1.2.3 -> 1.1.2.4) 

---- Diffs:

================================================================
Index: SPECS/kernel-bare-grsecurity.spec
diff -u SPECS/kernel-bare-grsecurity.spec:1.1.2.6 SPECS/kernel-bare-grsecurity.spec:1.1.2.7
--- SPECS/kernel-bare-grsecurity.spec:1.1.2.6	Sun Nov 11 12:33:52 2007
+++ SPECS/kernel-bare-grsecurity.spec	Sun Nov 11 23:19:38 2007
@@ -48,7 +48,7 @@
 
 %define		_basever	2.6.23
 %define		_postver	.1
-%define		_rel		2
+%define		_rel		3
 
 # for rc kernels basever is the version patch (source1) should be applied to
 #%define		_ver		2.6.20
@@ -160,7 +160,7 @@
 %endif
 
 %define __features Enabled features:\
-%{?debug:- DEBUG}\
+%{?debug: - DEBUG}\
 %define Features %(echo "%{__features}" | sed '/^$/d')
 # vim: "
 
@@ -647,8 +647,8 @@
 ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd-%{alt_kernel}
 
 if [ -x /sbin/new-kernel-pkg ]; then
-if [ -f %{_sysconfdir}/pld-release ]; then
-title=$(sed 's/^[0-9.]\+ //' < %{_sysconfdir}/pld-release)
+	if [ -f /etc/pld-release ]; then
+		title=$(sed 's/^[0-9.]\+ //' < /etc/pld-release)
 	else
 		title='PLD Linux'
 	fi
@@ -689,14 +689,14 @@
 %depmod %{kernel_release}
 
 %post headers
-rm -f %{_kernelsrcdir}-%{alt_kernel}
-ln -snf %{basename:%{_kernelsrcdir}} %{_kernelsrcdir}-%{alt_kernel}
+rm -f %{_prefix}/src/linux-%{alt_kernel}
+ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux-%{alt_kernel}
 
 %postun headers
 if [ "$1" = "0" ]; then
-	if [ -L %{_kernelsrcdir}-%{alt_kernel} ]; then
-		if [ "$(readlink %{_kernelsrcdir}-%{alt_kernel})" = "linux-%{version}_%{alt_kernel}" ]; then
-			rm -f %{_kernelsrcdir}-%{alt_kernel}
+	if [ -L %{_prefix}/src/linux-%{alt_kernel} ]; then
+		if [ "$(readlink %{_prefix}/src/linux-%{alt_kernel})" = "linux-%{version}_%{alt_kernel}" ]; then
+			rm -f %{_prefix}/src/linux-%{alt_kernel}
 		fi
 	fi
 fi
@@ -851,7 +851,7 @@
 %exclude %{_kernelsrcdir}/scripts/*.sh
 %{_kernelsrcdir}/sound
 %{_kernelsrcdir}/security
-%{_kernelsrcdir}%{_prefix}
+%{_kernelsrcdir}/usr
 %{_kernelsrcdir}/COPYING
 %{_kernelsrcdir}/CREDITS
 %{_kernelsrcdir}/MAINTAINERS
@@ -865,6 +865,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.7  2007-11-11 22:19:38  hawk
+- reverted adapter stupidity
+- release 3
+
 Revision 1.1.2.6  2007-11-11 11:33:52  hawk
 - release 2
 

================================================================
Index: SPECS/kernel-bare-vserver.spec
diff -u SPECS/kernel-bare-vserver.spec:1.1.2.3 SPECS/kernel-bare-vserver.spec:1.1.2.4
--- SPECS/kernel-bare-vserver.spec:1.1.2.3	Sun Nov 11 12:35:46 2007
+++ SPECS/kernel-bare-vserver.spec	Sun Nov 11 23:19:38 2007
@@ -43,7 +43,7 @@
 
 %define		_basever	2.6.22
 %define		_postver	.12
-%define		_rel		2
+%define		_rel		3
 
 # for rc kernels basever is the version patch (source1) should be applied to
 #%define		_ver		2.6.20
@@ -156,7 +156,7 @@
 %endif
 
 %define __features Enabled features:\
-%{?debug:- DEBUG}\
+%{?debug: - DEBUG}\
 %define Features %(echo "%{__features}" | sed '/^$/d')
 # vim: "
 
@@ -630,8 +630,8 @@
 ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd-%{alt_kernel}
 
 if [ -x /sbin/new-kernel-pkg ]; then
-if [ -f %{_sysconfdir}/pld-release ]; then
-title=$(sed 's/^[0-9.]\+ //' < %{_sysconfdir}/pld-release)
+	if [ -f /etc/pld-release ]; then
+		title=$(sed 's/^[0-9.]\+ //' < /etc/pld-release)
 	else
 		title='PLD Linux'
 	fi
@@ -672,14 +672,14 @@
 %depmod %{kernel_release}
 
 %post headers
-rm -f %{_kernelsrcdir}-%{alt_kernel}
-ln -snf %{basename:%{_kernelsrcdir}} %{_kernelsrcdir}-%{alt_kernel}
+rm -f %{_prefix}/src/linux-%{alt_kernel}
+ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux-%{alt_kernel}
 
 %postun headers
 if [ "$1" = "0" ]; then
-	if [ -L %{_kernelsrcdir}-%{alt_kernel} ]; then
-		if [ "$(readlink %{_kernelsrcdir}-%{alt_kernel})" = "linux-%{version}_%{alt_kernel}" ]; then
-			rm -f %{_kernelsrcdir}-%{alt_kernel}
+	if [ -L %{_prefix}/src/linux-%{alt_kernel} ]; then
+		if [ "$(readlink %{_prefix}/src/linux-%{alt_kernel})" = "linux-%{version}_%{alt_kernel}" ]; then
+			rm -f %{_prefix}/src/linux-%{alt_kernel}
 		fi
 	fi
 fi
@@ -834,7 +834,7 @@
 %exclude %{_kernelsrcdir}/scripts/*.sh
 %{_kernelsrcdir}/sound
 %{_kernelsrcdir}/security
-%{_kernelsrcdir}%{_prefix}
+%{_kernelsrcdir}/usr
 %{_kernelsrcdir}/COPYING
 %{_kernelsrcdir}/CREDITS
 %{_kernelsrcdir}/MAINTAINERS
@@ -848,6 +848,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.1.2.4  2007-11-11 22:19:38  hawk
+- reverted adapter stupidity
+- release 3
+
 Revision 1.1.2.3  2007-11-11 11:35:46  hawk
 - fixed squashfs for 2.6.22
 - release 2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-bare-grsecurity.spec?r1=1.1.2.6&r2=1.1.2.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-bare-vserver.spec?r1=1.1.2.3&r2=1.1.2.4&f=u