SPECS (LINUX_2_6): kernel.spec - fix _alt_kernel logic, thnx glen

[zbyniu]

Author: zbyniu                       Date: Tue Nov  4 18:48:44 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- fix _alt_kernel logic, thnx glen

---- Files affected:
SPECS:
   kernel.spec (1.441.2.2003 -> 1.441.2.2004) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.2003 SPECS/kernel.spec:1.441.2.2004
--- SPECS/kernel.spec:1.441.2.2003	Tue Nov  4 14:10:05 2008
+++ SPECS/kernel.spec	Tue Nov  4 19:48:37 2008
@@ -113,8 +113,11 @@
 %define		netfilter_snap		20070806
 %define		xen_version		3.0.2
 
-%define		_alt_kernel	%{?with_pax:-pax}%{!?with_grsec_full:-nogrsecurity}%{?with_xen0:-xen0}%{?with_xenU:-xenU}%{?with_pae:-pae}%{?with_myown:-myown}%{!?with_apparmor:-noaa}
-%define		_alt_kernel	%{?with_rescuecd:-rescuecd}
+%if %{without rescuecd}
+%define		_alt_kernel	%{?with_pax:-pax}%{!?with_grsec_full:-nogrsecurity}%{!?with_apparmor:-noaa}%{?with_xen0:-xen0}%{?with_xenU:-xenU}%{?with_pae:-pae}%{?with_myown:-myown}
+%else
+%define		_alt_kernel	-rescuecd
+%endif
 
 # kernel release (used in filesystem and eventually in uname -r)
 # modules will be looked from /lib/modules/%{kernel_release}
@@ -338,7 +341,7 @@
 %ifarch sparc sparc64
 BuildRequires:	elftoaout
 %endif
-%if "%{_arch}" == ppc
+%ifarch ppc
 BuildRequires:	uboot-mkimage
 %endif
 BuildRequires:	/sbin/depmod
@@ -1651,8 +1654,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.2004  2008/11/04 18:48:37  zbyniu
+- fix _alt_kernel logic, thnx glen
+
 Revision 1.441.2.2003  2008/11/04 13:10:05  zbyniu
-- force _alt_kernel rescuecd for rescuecd
+- force _alt_kernel "-rescuecd" for rescuecd
 
 Revision 1.441.2.2002  2008/11/04 11:58:02  arekm
 - typo
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel.spec?r1=1.441.2.2003&r2=1.441.2.2004&f=u