rpms/kernel/devel kernel-2.6.spec,1.2107,1.2108

[fedora-cvs-commits redhat com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4928

Modified Files:
	kernel-2.6.spec 
Log Message:
trailing whitespace removal



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2107
retrieving revision 1.2108
diff -u -r1.2107 -r1.2108
--- kernel-2.6.spec	30 Mar 2006 23:54:42 -0000	1.2107
+++ kernel-2.6.spec	30 Mar 2006 23:57:06 -0000	1.2108
@@ -35,7 +35,7 @@
 # groups of related archs
 %define all_x86 i586 i686
 
-# Override generic defaults with per-arch defaults 
+# Override generic defaults with per-arch defaults
 
 %ifarch noarch
 %define builddoc 1
@@ -138,10 +138,10 @@
 #
 %define kernel_dot_org_conflicts  ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2
 
-# 
-# Then a series of requirements that are distribution specific, either 
-# because we add patches for something, or the older versions have 
-# problems with the newer kernel or lack certain things that make 
+#
+# Then a series of requirements that are distribution specific, either
+# because we add patches for something, or the older versions have
+# problems with the newer kernel or lack certain things that make
 # integration in the distro harder than needed.
 #
 %define package_conflicts kudzu < 1.2.5, initscripts < 7.23, udev < 063-6, iptables < 1.3.2-1, ipw2200-firmware < 2.4, selinux-policy-targeted < 1.25.3-14
@@ -422,7 +422,7 @@
 Obsoletes: kernel-smp
 %endif
 
-%description 
+%description
 The kernel package contains the Linux kernel (vmlinuz), the core of any
 Linux operating system.  The kernel handles the basic functions
 of the operating system:  memory allocation, process allocation, device
@@ -447,7 +447,7 @@
 %description doc
 This package contains documentation files from the kernel
 source. Various bits of information about the Linux kernel and the
-device drivers shipped with it are documented in these files. 
+device drivers shipped with it are documented in these files.
 
 You'll want to install this package if you need a reference to the
 options that can be passed to Linux kernel modules at load time.
@@ -503,7 +503,7 @@
 Conflicts: %{package_conflicts}
 Conflicts: %{xen_conflicts}
 # the hypervisor kernel needs a newer mkinitrd than everything else right now
-Conflicts: mkinitrd <= 4.2.0 
+Conflicts: mkinitrd <= 4.2.0
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
@@ -542,7 +542,7 @@
 Conflicts: %{package_conflicts}
 Conflicts: %{xen_conflicts}
 # the xen0-PAE kernel needs a newer mkinitrd than everything else right now
-Conflicts: mkinitrd <= 4.2.0 
+Conflicts: mkinitrd <= 4.2.0
 # We can't let RPM do the dependencies automatic because it'll then pick up
 # a correct but undesirable perl dependency from the module headers which
 # isn't required for the kernel proper to function
@@ -788,7 +788,7 @@
 done
 # Delete the rest of the backup files, they just confuse the build later
 find -name "*.p.xen" | xargs rm -f
-    
+
 #
 # Xen includes a patch which moves the vsyscall fixmap into a user-space VA,
 # freeing user-space from reliance on an absolute fixmap area and so allowing
@@ -877,7 +877,7 @@
 %patch1034 -p1
 
 #
-# Make /dev/mem a need-to-know function 
+# Make /dev/mem a need-to-know function
 #
 %patch1050 -p1
 %if %{includexen}
@@ -1046,8 +1046,8 @@
 
 # now run oldconfig over all the config files
 for i in *.config
-do 
-  mv $i .config 
+do
+  mv $i .config
   Arch=`head -1 .config | cut -b 3-`
 %if %{includexen}
   make ARCH=$Arch nonint_oldconfig > /dev/null
@@ -1057,7 +1057,7 @@
   fi
 %endif
   echo "# $Arch" > configs/$i
-  cat .config >> configs/$i 
+  cat .config >> configs/$i
 done
 
 # make sure the kernel has the sublevel we know it has. This looks weird
@@ -1077,8 +1077,8 @@
 # Create gpg keys for signing the modules
 #
 
-gpg --homedir . --batch --gen-key %{SOURCE11}  
-gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub 
+gpg --homedir . --batch --gen-key %{SOURCE11}
+gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub
 make linux-%{kversion}.%{_target_cpu}/scripts/bin2c
 linux-%{kversion}.%{_target_cpu}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}.%{_target_cpu}/crypto/signature/key.h
 
@@ -1213,10 +1213,10 @@
     # gpg sign the modules
 %if %{signmodules}
     gcc -o scripts/modsign/mod-extract scripts/modsign/mod-extract.c -Wall
-    KEYFLAGS="--no-default-keyring --homedir .." 
-    KEYFLAGS="$KEYFLAGS --secret-keyring ../kernel.sec" 
-    KEYFLAGS="$KEYFLAGS --keyring ../kernel.pub" 
-    export KEYFLAGS 
+    KEYFLAGS="--no-default-keyring --homedir .."
+    KEYFLAGS="$KEYFLAGS --secret-keyring ../kernel.sec"
+    KEYFLAGS="$KEYFLAGS --keyring ../kernel.pub"
+    export KEYFLAGS
 
     for i in `cat modnames`
     do
@@ -1232,7 +1232,7 @@
     # detect missing or incorrect license tags
     for i in `cat modnames`
     do
-      echo -n "$i " 
+      echo -n "$i "
       /sbin/modinfo -l $i >> modinfo
     done
     cat modinfo |\
@@ -1240,7 +1240,7 @@
       grep -v "^Dual BSD/GPL" |\
       grep -v "^Dual MPL/GPL" |\
       grep -v "^GPL and additional rights" |\
-      grep -v "^GPL v2" && exit 1 
+      grep -v "^GPL v2" && exit 1
     rm -f modinfo
     rm -f modnames
     # remove files that will be auto generated by depmod at rpm -i time
@@ -1350,7 +1350,7 @@
 
 # load the loop module for upgrades...in case the old modules get removed we have
 # loopback in the kernel so that mkinitrd will work.
-%pre 
+%pre
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 exit 0
 
@@ -1358,7 +1358,7 @@
 /sbin/modprobe loop 2> /dev/null > /dev/null  || :
 exit 0
 
-%post 
+%post
 if [ `uname -i` == "x86_64" ]; then
   if [ -f /etc/sysconfig/kernel ]; then
     /bin/sed -i -e 's/^DEFAULTKERNEL=kernel-smp$/DEFAULTKERNEL=kernel/' /etc/sysconfig/kernel