rpms/kernel-xen-2.6/F-7 kernel.spec,1.1.2.8,1.1.2.9

[Eduardo Habkost (ehabkost)]

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1936

Modified Files:
      Tag: private-ehabkost-debuginfo-branch
	kernel.spec 
Log Message:
Fix kernel_variant_{post,preun} usage



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/F-7/Attic/kernel.spec,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- kernel.spec	18 Oct 2007 14:43:37 -0000	1.1.2.8
+++ kernel.spec	18 Oct 2007 15:23:20 -0000	1.1.2.9
@@ -2096,7 +2096,6 @@
 # More text can follow to go at the end of this variant's %%post.
 #
 %define kernel_variant_post(s:r:v:) \
-%if %{1}\
 %{expand:%%kernel_devel_post %{?-v*}}\
 %{expand:%%post -n %{variantbase}%{?-v:-%{-v*}}}\
 %{-s:\
@@ -2104,12 +2103,11 @@
    [ -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 %{?2} %{KVERREL}%{?-v*} || 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}%{?-v*} || exit $?\
 #fi\
-%endif\
 %{nil}
 
 #
@@ -2117,37 +2115,47 @@
 #	%%kernel_variant_preun <subpackage>
 #
 %define kernel_variant_preun() \
-%if %{1}\
-%{expand:%%preun -n %{variantbase}%{?2:-%{2}}}\
-/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}%{?2} || exit $?\
+%{expand:%%preun -n %{variantbase}%{?1:-%{1}}}\
+/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}%{?1} || exit $?\
 #if [ -x /sbin/weak-modules ]\
 #then\
-#    /sbin/weak-modules --remove-kernel %{KVERREL}%{?2} || exit $?\
+#    /sbin/weak-modules --remove-kernel %{KVERREL}%{?1} || exit $?\
 #fi\
-%endif\
 %{nil}
 
-%kernel_variant_preun %{with_up}
-%kernel_variant_post %{with_up} -s kernel-smp -r kernel
+%if %{with_up}
+%kernel_variant_preun
+%kernel_variant_post -s kernel-smp -r kernel
+%endif
 
-%kernel_variant_preun %{with_smp} smp
-%kernel_variant_post %{with_smp} -v smp
+%if %{with_smp}
+%kernel_variant_preun smp
+%kernel_variant_post -v smp
+%endif
 
-%kernel_variant_preun %{with_pae} PAE
-%kernel_variant_post %{with_pae} -v PAE -s kernel-smp -r kernel-PAE
+%if %{with_pae}
+%kernel_variant_preun PAE
+%kernel_variant_post -v PAE -s kernel-smp -r kernel-PAE
+%endif
 
-%kernel_variant_preun %{with_debug} debug
-%kernel_variant_post %{with_debug} -v debug
+%if %{with_debug}
+%kernel_variant_preun debug
+%kernel_variant_post -v debug
+%endif
 
-%kernel_variant_preun %{with_pae_debug} PAE-debug
-%kernel_variant_post %{with_pae_debug} -v PAE-debug -s kernel-smp -r kernel-PAE-debug
+%if %{with_pae_debug}
+%kernel_variant_preun PAE-debug
+%kernel_variant_post -v PAE-debug -s kernel-smp -r kernel-PAE-debug
+%endif
 
-%kernel_variant_preun %{with_xen} xen
-%kernel_variant_post %{with_xen} xen -v xen -s kernel-xen[0U] -r kernel-xen -- `[ -d /proc/xen -a ! -e /proc/xen/xsd_kva ] || echo --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}`
+%if %{with_xen}
+%kernel_variant_preun xen
+%kernel_variant_post xen -v xen -s kernel-xen[0U] -r kernel-xen -- `[ -d /proc/xen -a ! -e /proc/xen/xsd_kva ] || echo --multiboot=/%{image_install_path}/xen.gz-%{KVERREL}`
 if [ -x /sbin/ldconfig ]
 then
     /sbin/ldconfig -X || exit $?
 fi
+%endif
 
 ###
 ### file lists