rpms/kernel/devel kernel.spec,1.641,1.642

[John W. Linville (linville)]

Author: linville

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25216

Modified Files:
	kernel.spec 
Log Message:
fix unintentional damage to kernel.spec


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.641
retrieving revision 1.642
diff -u -r1.641 -r1.642
--- kernel.spec	19 May 2008 18:40:11 -0000	1.641
+++ kernel.spec	19 May 2008 18:43:45 -0000	1.642
@@ -1274,9 +1274,9 @@
     # When the bootable image is just the ELF kernel, strip it.
     # We already copy the unstripped file into the debuginfo package.
     if [ "$KernelImage" = vmlinux ]; then
-- CopyKernel=cp_vmlinux
+      CopyKernel=cp_vmlinux
     else
-- CopyKernel=cp
+      CopyKernel=cp
     fi
 
     KernelVer=%{version}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}
@@ -1315,7 +1315,7 @@
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
     touch $RPM_BUILD_ROOT/boot/initrd-$KernelVer.img
     if [ -f arch/$Arch/boot/zImage.stub ]; then
-- cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
+      cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
     fi
     $CopyKernel $KernelImage \
     		$RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
@@ -1347,7 +1347,7 @@
     cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     cp System.map $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     if [ -s Module.markers ]; then
-- cp Module.markers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+      cp Module.markers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     fi
     # then drop all but the needed Makefiles/Kconfig files
     rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Documentation
@@ -1356,10 +1356,10 @@
     cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
     if [ -d arch/%{_arch}/scripts ]; then
-- cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
+      cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
     fi
     if [ -f arch/%{_arch}/*lds ]; then
-- cp -a arch/%{_arch}/*lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/ || :
+      cp -a arch/%{_arch}/*lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/ || :
     fi
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
@@ -1370,11 +1370,11 @@
     # While arch/powerpc/include/asm is still a symlink to the old
     # include/asm-ppc{64,} directory, include that in kernel-devel too.
     if [ "$Arch" = "powerpc" -a -r ../arch/powerpc/include/asm ]; then
-- cp -a `readlink ../arch/powerpc/include/asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
-- mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/$Arch/include
-- pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/$Arch/include
-- ln -sf ../../../include/asm-ppc* asm
-- popd
+      cp -a `readlink ../arch/powerpc/include/asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
+      mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/$Arch/include
+      pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/$Arch/include
+      ln -sf ../../../include/asm-ppc* asm
+      popd
     fi
 %if %{includexen}
     cp -a xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
@@ -1408,8 +1408,8 @@
 
     collect_modules_list()
     {
-- sed -r -n -e "s/^([^ ]+) \\.?($2)\$/\\1/p" drivers.undef |
-- LC_ALL=C sort -u > $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$1
+      sed -r -n -e "s/^([^ ]+) \\.?($2)\$/\\1/p" drivers.undef |
+      LC_ALL=C sort -u > $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$1
     }
 
     collect_modules_list networking \
@@ -1421,8 +1421,8 @@
     rm -f modinfo
     while read i
     do
-- echo -n "${i#$RPM_BUILD_ROOT/lib/modules/$KernelVer/} " >> modinfo
-- /sbin/modinfo -l $i >> modinfo
+      echo -n "${i#$RPM_BUILD_ROOT/lib/modules/$KernelVer/} " >> modinfo
+      /sbin/modinfo -l $i >> modinfo
     done < modnames
 
     egrep -v \
@@ -1434,7 +1434,7 @@
     # remove files that will be auto generated by depmod at rpm -i time
     for i in alias ccwmap dep ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols usbmap
     do
-- rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i
+      rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i
     done
 
     # Move the devel headers out of the root file system
@@ -1606,7 +1606,7 @@
 then\
     (cd /usr/src/kernels/%{KVERREL}%{?1:.%{1}} &&\
      /usr/bin/find . -type f | while read f; do\
--  hardlink -c /usr/src/kernels/*.fc*.*/$f $f\
+       hardlink -c /usr/src/kernels/*.fc*.*/$f $f\
      done)\
 fi\
 %{nil}