- rollback last two commits, and fix %else vs %endif macro typo instead

Changed files:
    kernel.spec -> 1.995

diff --git a/kernel.spec b/kernel.spec
index 20a1a1d9cca912edb097eb39eeac6d3d5a740813..69324850087dc853f2acf345adf8221e4c1189dc 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -99,6 +99,9 @@
 %define                tuxonice_version        3.2
 %define                module_init_tools_ver   3.16
 
+# __alt_kernel is list of features, empty string if none set
+# _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
+# alt_kernel should be defined if __alt_kernel has non-empty value (for %{?alt_kernel:foo} constructs)
 %define                __alt_kernel    %{?with_pax:pax}%{!?with_grsecurity:nogrsecurity}%{?with_pae:pae}
 
 %if "%{__alt_kernel}" != ""
@@ -106,7 +109,7 @@
 %endif
 
 # these override whatever name was picked from bconds
-%if %{with myown} && "%{__alt_kernel}" == ""
+%if %{with myown} && "%{_alt_kernel}" == ""
 %define                alt_kernel      myown
 %endif
 %if %{with rescuecd}
@@ -127,7 +130,7 @@ Summary(de.UTF-8):  Der Linux-Kernel (Kern des Linux-Betriebssystems)
 Summary(et.UTF-8):     Linuxi kernel (ehk operatsioonisüsteemi tuum)
 Summary(fr.UTF-8):     Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl.UTF-8):     Jądro Linuksa
-Name:          kernel%{?alt_kernel:_%{alt_kernel}}
+Name:          kernel%{_alt_kernel}
 Version:       %{basever}%{postver}
 Release:       %{rel}
 Epoch:         3
@@ -319,12 +322,12 @@ Requires: module-init-tools >= %{module_init_tools_ver}
 Suggests:      keyutils
 Provides:      %{name}(netfilter) = 20070806
 Provides:      %{name}(vermagic) = %{kernel_release}
-Obsoletes:     kernel%{?alt_kernel:_%{alt_kernel}}-isdn-mISDN
-Obsoletes:     kernel%{?alt_kernel:_%{alt_kernel}}-char-lirc-ene0100
-Obsoletes:     kernel%{?alt_kernel:_%{alt_kernel}}-char-lirc-it87
-Obsoletes:     kernel%{?alt_kernel:_%{alt_kernel}}-char-lirc-ite8709
-Obsoletes:     kernel%{?alt_kernel:_%{alt_kernel}}-char-lirc-mceusb
-Obsoletes:     kernel%{?alt_kernel:_%{alt_kernel}}-char-lirc-streamzap
+Obsoletes:     kernel%{_alt_kernel}-isdn-mISDN
+Obsoletes:     kernel%{_alt_kernel}-char-lirc-ene0100
+Obsoletes:     kernel%{_alt_kernel}-char-lirc-it87
+Obsoletes:     kernel%{_alt_kernel}-char-lirc-ite8709
+Obsoletes:     kernel%{_alt_kernel}-char-lirc-mceusb
+Obsoletes:     kernel%{_alt_kernel}-char-lirc-streamzap
 Obsoletes:     kernel-firmware
 Obsoletes:     kernel-misc-acer_acpi
 Obsoletes:     kernel-misc-fuse
@@ -391,7 +394,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                objdir          %{topdir}/%{targetobj}
 %define                targetobj       %{_target_base_arch}-gcc-%(%{kgcc} -dumpversion)
 
-%define                _kernelsrcdir   /usr/src/linux%{?alt_kernel:_%{alt_kernel}}-%{version}
+%define                _kernelsrcdir   /usr/src/linux%{_alt_kernel}-%{version}
 
 %if "%{_target_base_arch}" != "%{_arch}"
        %define CrossOpts ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
@@ -1148,18 +1151,18 @@ fi
 %post
 %ifarch ia64
 mv -f /boot/efi/vmlinuz{,.old} 2> /dev/null
-%{?alt_kernel:mv -f /boot/efi/vmlinuz_%{alt_kernel}{,.old} 2> /dev/null}
+%{?alt_kernel:mv -f /boot/efi/vmlinuz%{_alt_kernel}{,.old} 2> /dev/null}
 ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz
-%{?alt_kernel:ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz_%{alt_kernel}}
+%{?alt_kernel:ln -sf vmlinuz-%{kernel_release} /boot/efi/vmlinuz%{_alt_kernel}}
 %endif
 mv -f /boot/vmlinuz{,.old} 2> /dev/null
-%{?alt_kernel:mv -f /boot/vmlinuz_%{alt_kernel}{,.old} 2> /dev/null}
+%{?alt_kernel:mv -f /boot/vmlinuz%{_alt_kernel}{,.old} 2> /dev/null}
 mv -f /boot/System.map{,.old} 2> /dev/null
-%{?alt_kernel:mv -f /boot/System_%{alt_kernel}.map{,.old} 2> /dev/null}
+%{?alt_kernel:mv -f /boot/System%{_alt_kernel}.map{,.old} 2> /dev/null}
 ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz
-%{?alt_kernel:ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz_%{alt_kernel}}
+%{?alt_kernel:ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz%{_alt_kernel}}
 ln -sf System.map-%{kernel_release} /boot/System.map
-%{?alt_kernel:ln -sf System.map-%{kernel_release} /boot/System.map_%{alt_kernel}}
+%{?alt_kernel:ln -sf System.map-%{kernel_release} /boot/System.map%{_alt_kernel}}
 
 %depmod %{kernel_release}
 
@@ -1167,9 +1170,9 @@ ln -sf System.map-%{kernel_release} /boot/System.map
 # generate initrd after all dependant modules are installed
 /sbin/geninitrd -f --initrdfs=rom %{initrd_dir}/initrd-%{kernel_release}.gz %{kernel_release}
 mv -f %{initrd_dir}/initrd{,.old} 2> /dev/null
-%{?alt_kernel:mv -f %{initrd_dir}/initrd_%{alt_kernel}{,.old} 2> /dev/null}
+%{?alt_kernel:mv -f %{initrd_dir}/initrd%{_alt_kernel}{,.old} 2> /dev/null}
 ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd
-%{?alt_kernel:ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd_%{alt_kernel}}
+%{?alt_kernel:ln -sf initrd-%{kernel_release}.gz %{initrd_dir}/initrd%{_alt_kernel}}
 
 # update boot loaders when old package files are gone from filesystem
 if [ -x /sbin/update-grub -a -f /etc/sysconfig/grub ]; then
@@ -1215,13 +1218,13 @@ ln -sf vmlinux-%{kernel_release} /boot/vmlinux
 %depmod %{kernel_release}
 
 %post headers
-ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{?alt_kernel:_%{alt_kernel}}
+ln -snf %{basename:%{_kernelsrcdir}} %{_prefix}/src/linux%{_alt_kernel}
 
 %postun headers
 if [ "$1" = "0" ]; then
-       if [ -L %{_prefix}/src/linux%{?alt_kernel:_%{alt_kernel}} ]; then
-               if [ "$(readlink %{_prefix}/src/linux%{?alt_kernel:_%{alt_kernel}})" = "linux%{?alt_kernel:_%{alt_kernel}}-%{version}" ]; then
-                       rm -f %{_prefix}/src/linux%{?alt_kernel:_%{alt_kernel}}
+       if [ -L %{_prefix}/src/linux%{_alt_kernel} ]; then
+               if [ "$(readlink %{_prefix}/src/linux%{_alt_kernel})" = "linux%{_alt_kernel}-%{version}" ]; then
+                       rm -f %{_prefix}/src/linux%{_alt_kernel}
                fi
        fi
 fi