rpms/kernel/devel kernel.spec,1.549,1.550

Jarod Wilson (jwilson) fedora-extras-commits at redhat.com
Thu Mar 27 17:08:23 UTC 2008


Author: jwilson

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

Modified Files:
	kernel.spec 
Log Message:
* Thu Mar 27 2008 Jarod Wilson <jwilson at redhat.com>
- One more try at fixing scriptlets for flavoured kernels (#439036)



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -r1.549 -r1.550
--- kernel.spec	27 Mar 2008 16:20:12 -0000	1.549
+++ kernel.spec	27 Mar 2008 17:07:37 -0000	1.550
@@ -1588,7 +1588,7 @@
 #
 %define kernel_variant_posttrans(s:r:v:) \
 %{expand:%%posttrans %{?-v*}}\
-/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --rpmposttrans %{KVERREL}%{?-v*} || exit $?\
+/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --rpmposttrans %{KVERREL}%{?-v:.%{-v*}} || exit $?\
 %{nil}
 
 #
@@ -1605,7 +1605,7 @@
    [ -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%{?-v:-%{-v*}} --mkinitrd --depmod --install %{?1} %{KVERREL}%{?-v*} || exit $?\
+/sbin/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --mkinitrd --depmod --install %{?1} %{KVERREL}%{?-v:.%{-v*}} || exit $?\
 #if [ -x /sbin/weak-modules ]\
 #then\
 #    /sbin/weak-modules --add-kernel %{KVERREL}%{?-v*} || exit $?\
@@ -1741,6 +1741,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Thu Mar 27 2008 Jarod Wilson <jwilson at redhat.com>
+- One more try at fixing scriptlets for flavoured kernels (#439036)
+
 * Thu Mar 27 2008 Dave Jones <davej at redhat.com>
 - 2.6.25-rc7-git2
 




More information about the fedora-extras-commits mailing list