SPECS (LINUX_2_6_24): kernel-desktop.spec - disabled noarch separation for ...

[hawk]

Author: hawk                         Date: Sun Jun  8 13:13:04 2008 GMT
Module: SPECS                         Tag: LINUX_2_6_24
---- Log message:
- disabled noarch separation for PLD Titanium

---- Files affected:
SPECS:
   kernel-desktop.spec (1.196.2.12 -> 1.196.2.13) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.196.2.12 SPECS/kernel-desktop.spec:1.196.2.13
--- SPECS/kernel-desktop.spec:1.196.2.12	Sun Jun  8 14:05:45 2008
+++ SPECS/kernel-desktop.spec	Sun Jun  8 15:12:58 2008
@@ -47,6 +47,10 @@
 %define		with_noarch	1
 %endif
 
+%if "%{pld_release}" == "ti"
+%undefine	with_noarch
+%endif
+
 %ifarch %{ix86} ppc
 %define		have_isa	1
 %else
@@ -76,7 +80,7 @@
 
 %define		_basever	2.6.24
 %define		_postver	.7
-%define		_rel		2
+%define		_rel		3
 %define		_rc	%{nil}
 
 %define		_enable_debug_packages			0
@@ -259,6 +263,7 @@
 BuildRequires:	perl-base
 BuildRequires:	python
 BuildRequires:	python-modules
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.217
 Autoreqprov:	no
 Requires:	/sbin/depmod
@@ -285,7 +290,11 @@
 Conflicts:	util-linux < 2.10o
 Conflicts:	xfsprogs < 2.6.0
 %{?with_noarch:BuildArch:	noarch}
+%if "%{pld_release}" == "ti"
+ExclusiveArch:	%{ix86} %{x8664} ppc
+%else
 ExclusiveArch:	%{ix86} %{x8664} ppc noarch
+%endif
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -910,7 +919,7 @@
 cp -a %{objdir}/include/linux/{utsrelease,version}.h $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
 %endif # arch dependant
 
-%if %{with noarch}
+%if %{with noarch} || "%{pld_release}" == "ti"
 # test if we can hardlink -- %{_builddir} and $RPM_BUILD_ROOT on same partition
 if cp -al %{srcdir}/COPYING $RPM_BUILD_ROOT/COPYING 2>/dev/null; then
 	l=l
@@ -1107,7 +1116,7 @@
 %{_kernelsrcdir}/include/linux/version.h
 %endif # noarch package
 
-%if %{with noarch}
+%if %{with noarch}  || "%{pld_release}" == "ti"
 %files headers
 %defattr(644,root,root,755)
 %{_kernelsrcdir}/include/*
@@ -1186,6 +1195,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.196.2.13  2008-06-08 13:12:58  hawk
+- disabled noarch separation for PLD Titanium
+
 Revision 1.196.2.12  2008-06-08 12:05:45  hawk
 - killed pcmcia dependency in ssb.ko by disabling B43_PCMCIA in config
 
================================================================

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