SPECS (LINUX_2_6_18): kernel-vanilla.spec - unify /usr -> %{_prefix}

[shadzik]

Author: shadzik                      Date: Wed Dec 20 01:46:01 2006 GMT
Module: SPECS                         Tag: LINUX_2_6_18
---- Log message:
- unify /usr -> %{_prefix}

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.14.2.15 -> 1.14.2.16) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.14.2.15 SPECS/kernel-vanilla.spec:1.14.2.16
--- SPECS/kernel-vanilla.spec:1.14.2.15	Wed Dec 20 02:39:01 2006
+++ SPECS/kernel-vanilla.spec	Wed Dec 20 02:45:56 2006
@@ -636,13 +636,13 @@
 %{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" .config}
 
 	install .config arch/%{_target_base_arch}/defconfig
-	install -d $KERNEL_INSTALL_DIR/usr/src/linux-%{ver}/include/linux
+	install -d $KERNEL_INSTALL_DIR%{_prefix}/src/linux-%{ver}/include/linux
 	rm -f include/linux/autoconf.h
 	%{__make} %{MakeOpts} include/linux/autoconf.h
 	install include/linux/autoconf.h \
-		$KERNEL_INSTALL_DIR/usr/src/linux-%{ver}/include/linux/autoconf-${cfg}.h
+		$KERNEL_INSTALL_DIR%{_prefix}/src/linux-%{ver}/include/linux/autoconf-${cfg}.h
 	install .config \
-		$KERNEL_INSTALL_DIR/usr/src/linux-%{ver}/config-${cfg}
+		$KERNEL_INSTALL_DIR%{_prefix}/src/linux-%{ver}/config-${cfg}
 	install .config arch/%{_target_base_arch}/defconfig
 }
 
@@ -719,7 +719,7 @@
 		KERNELRELEASE=$KernelVer
 
 	install Module.symvers \
-		$KERNEL_INSTALL_DIR/usr/src/linux-%{ver}/Module.symvers-${cfg}
+		$KERNEL_INSTALL_DIR%{_prefix}/src/linux-%{ver}/Module.symvers-${cfg}
 
 	echo "CHECKING DEPENDENCIES FOR KERNEL MODULES"
 	%if "%{_target_base_arch}" != "%{_arch}"
@@ -783,7 +783,7 @@
 
 ln -sf linux-%{ver} $RPM_BUILD_ROOT%{_prefix}/src/linux-%{alt_kernel}
 
-find . -maxdepth 1 ! -name "build-done" ! -name "." -exec cp -a$1 "{}" "$RPM_BUILD_ROOT/usr/src/linux-%{ver}/" ";"
+find . -maxdepth 1 ! -name "build-done" ! -name "." -exec cp -a$1 "{}" "$RPM_BUILD_ROOT%{_prefix}/src/linux-%{ver}/" ";"
 
 cd $RPM_BUILD_ROOT%{_prefix}/src/linux-%{ver}
 
@@ -792,27 +792,27 @@
 
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
-if [ -e $KERNEL_BUILD_DIR/build-done/kernel-UP/usr/src/linux-%{ver}/include/linux/autoconf-up.h ]; then
-install $KERNEL_BUILD_DIR/build-done/kernel-UP/usr/src/linux-%{ver}/include/linux/autoconf-up.h \
-	$RPM_BUILD_ROOT/usr/src/linux-%{ver}/include/linux
-install	$KERNEL_BUILD_DIR/build-done/kernel-UP/usr/src/linux-%{ver}/config-up \
-	$RPM_BUILD_ROOT/usr/src/linux-%{ver}
+if [ -e $KERNEL_BUILD_DIR/build-done/kernel-UP%{_prefix}/src/linux-%{ver}/include/linux/autoconf-up.h ]; then
+install $KERNEL_BUILD_DIR/build-done/kernel-UP%{_prefix}/src/linux-%{ver}/include/linux/autoconf-up.h \
+	$RPM_BUILD_ROOT%{_prefix}/src/linux-%{ver}/include/linux
+install	$KERNEL_BUILD_DIR/build-done/kernel-UP%{_prefix}/src/linux-%{ver}/config-up \
+	$RPM_BUILD_ROOT%{_prefix}/src/linux-%{ver}
 fi
 
-if [ -e $KERNEL_BUILD_DIR/build-done/kernel-SMP/usr/src/linux-%{ver}/include/linux/autoconf-smp.h ]; then
-install $KERNEL_BUILD_DIR/build-done/kernel-SMP/usr/src/linux-%{ver}/include/linux/autoconf-smp.h \
-	$RPM_BUILD_ROOT/usr/src/linux-%{ver}/include/linux
-install	$KERNEL_BUILD_DIR/build-done/kernel-SMP/usr/src/linux-%{ver}/config-smp \
-	$RPM_BUILD_ROOT/usr/src/linux-%{ver}
+if [ -e $KERNEL_BUILD_DIR/build-done/kernel-SMP%{_prefix}/src/linux-%{ver}/include/linux/autoconf-smp.h ]; then
+install $KERNEL_BUILD_DIR/build-done/kernel-SMP%{_prefix}/src/linux-%{ver}/include/linux/autoconf-smp.h \
+	$RPM_BUILD_ROOT%{_prefix}/src/linux-%{ver}/include/linux
+install	$KERNEL_BUILD_DIR/build-done/kernel-SMP%{_prefix}/src/linux-%{ver}/config-smp \
+	$RPM_BUILD_ROOT%{_prefix}/src/linux-%{ver}
 fi
 
 %if %{with up} || %{with smp}
 # UP or SMP
-install $KERNEL_BUILD_DIR/build-done/kernel-*/usr/src/linux-%{ver}/include/linux/* \
-	$RPM_BUILD_ROOT/usr/src/linux-%{ver}/include/linux
+install $KERNEL_BUILD_DIR/build-done/kernel-*%{_prefix}/src/linux-%{ver}/include/linux/* \
+	$RPM_BUILD_ROOT%{_prefix}/src/linux-%{ver}/include/linux
 %endif
 
-install $KERNEL_BUILD_DIR/build-done/kernel-UP/usr/src/linux-%{ver}/config-up \
+install $KERNEL_BUILD_DIR/build-done/kernel-UP%{_prefix}/src/linux-%{ver}/config-up \
 	.config
 %{__make} %{MakeOpts} include/linux/version.h include/linux/utsrelease.h
 mv include/linux/version.h{,.save}
@@ -971,8 +971,8 @@
 %depmod %{ver_rel}smp
 
 %post headers
-rm -f /usr/src/linux-%{alt_kernel}
-ln -snf linux-%{ver} /usr/src/linux-%{alt_kernel}
+rm -f %{_prefix}/src/linux-%{alt_kernel}
+ln -snf linux-%{ver} %{_prefix}/src/linux-%{alt_kernel}
 
 %postun headers
 if [ "$1" = "0" ]; then
@@ -1268,6 +1268,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14.2.16  2006/12/20 01:45:56  shadzik
+- unify /usr -> %{_prefix}
+
 Revision 1.14.2.15  2006/12/20 01:39:01  shadzik
 - hardlink over copy speedup
 
================================================================

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