rpms/kernel/devel kernel.spec,1.100,1.101

[Jarod Wilson (jwilson)]

Author: jwilson

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

Modified Files:
	kernel.spec 
Log Message:
More complete fix for %%post scriptlet generation (problems existed on PAE too)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- kernel.spec	20 Aug 2007 14:04:43 -0000	1.100
+++ kernel.spec	20 Aug 2007 15:27:24 -0000	1.101
@@ -1628,10 +1628,10 @@
    [ -f /etc/sysconfig/kernel ]; then\
   /bin/sed -i -e 's/^DEFAULTKERNEL=%{-s*}$/DEFAULTKERNEL=%{-r*}/' /etc/sysconfig/kernel || exit $?\
 fi}\
-/sbin/new-kernel-pkg --package kernel%{?1:-%{1}} --mkinitrd --depmod --install %{?2} %{KVERREL}%{?1} || exit $?\
+/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{?1} %{KVERREL}%{?-v*} || exit $?\
 #if [ -x /sbin/weak-modules ]\
 #then\
-#    /sbin/weak-modules --add-kernel %{KVERREL}%{?1} || exit $?\
+#    /sbin/weak-modules --add-kernel %{KVERREL}%{?-v*} || exit $?\
 #fi\
 %{nil}
 
@@ -1652,7 +1652,7 @@
 %kernel_variant_post -s kernel-smp -r kernel
 
 %kernel_variant_preun smp
-%kernel_variant_post smp -v smp -s kernel-smp -r kernel-smp
+%kernel_variant_post -v smp
 
 %kernel_variant_preun PAE
 %kernel_variant_post -v PAE -s kernel-smp -r kernel-PAE
@@ -1754,6 +1754,9 @@
 
 
 %changelog
+* Mon Aug 20 2007 Jarod Wilson <jwilson at redhat.com>
+- Better fix for variant kernel %%post scriptlet generation
+
 * Mon Aug 20 2007 Tom "spot" Callaway <tcallawa at redhat.com>
 - fix post -smp scriplet