rpms/kernel/devel kernel.spec,1.1535,1.1536

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2146

Modified Files:
	kernel.spec 
Log Message:
Make the kernel-vanilla package buildable again.
Allow building with older versions of RPM.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1535
retrieving revision 1.1536
diff -u -p -r1.1535 -r1.1536
--- kernel.spec	28 Apr 2009 11:25:45 -0000	1.1535
+++ kernel.spec	28 Apr 2009 15:16:32 -0000	1.1536
@@ -872,12 +872,14 @@ exit 1
 %endif
 
 # more sanity checking; do it quietly
-for patch in %{patches} ; do
-  if [ ! -f $patch ] ; then
-    echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
-    exit 1
-  fi
-done 2>/dev/null
+if [ "%{patches}" != "%%{patches}" ] ; then
+  for patch in %{patches} ; do
+    if [ ! -f $patch ] ; then
+      echo "ERROR: Patch  ${patch##/*/}  listed in specfile but is missing"
+      exit 1
+    fi
+  done
+fi 2>/dev/null
 
 patch_command='patch -p1 -F1 -s'
 ApplyPatch()
@@ -887,7 +889,7 @@ ApplyPatch()
   if [ ! -f $RPM_SOURCE_DIR/$patch ]; then
     exit 1
   fi
-  if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/%{name}.spec ; then
+  if ! egrep "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then
     if [ "${patch:0:10}" != "patch-2.6." ] ; then
       echo "ERROR: Patch  $patch  not listed as a source patch in specfile"
       exit 1
@@ -1830,6 +1832,10 @@ fi
 #	                ||----w |
 #	                ||     ||
 %changelog
+* Tue Apr 28 2009 Chuck Ebbert <cebbert at redhat.com>
+- Make the kernel-vanilla package buildable again.
+- Allow building with older versions of RPM.
+
 * Tue Apr 28 2009 Neil Horman <nhorman at redhat.com>
 - Backport missing snmp stats (bz 492391)