packages: kernel-xen0/kernel-xen0.spec - dropped "noarch" bcond. Build ever...

[pawelz]

Author: pawelz                       Date: Tue Feb 16 16:16:37 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dropped "noarch" bcond. Build everything as arch.

---- Files affected:
packages/kernel-xen0:
   kernel-xen0.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/kernel-xen0/kernel-xen0.spec
diff -u packages/kernel-xen0/kernel-xen0.spec:1.3 packages/kernel-xen0/kernel-xen0.spec:1.4
--- packages/kernel-xen0/kernel-xen0.spec:1.3	Mon Feb 15 15:23:28 2010
+++ packages/kernel-xen0/kernel-xen0.spec	Tue Feb 16 17:16:32 2010
@@ -9,7 +9,6 @@
 #
 # Conditional build:
 %bcond_without	source		# don't build kernel-source package
-%bcond_with	noarch		# build noarch packages
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	preempt-nort	# build preemptable no realtime kernel
@@ -20,10 +19,6 @@
 %undefine	with_pae
 %endif
 
-%if "%{_arch}" == "noarch"
-%define		with_noarch	1
-%endif
-
 %define		have_isa	1
 %define		have_oss	1
 %define		have_pcmcia	1
@@ -118,8 +113,7 @@
 Conflicts:	util-linux < 2.10o
 Conflicts:	xfsprogs < 2.6.0
 ExclusiveOS:	Linux
-%{?with_noarch:BuildArch:	noarch}
-ExclusiveArch:	%{ix86} %{x8664} noarch
+ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %ifarch %{ix86} %{x8664}
@@ -422,7 +416,6 @@
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -f
 
-%if %{without noarch}
 %build
 install -d %{objdir}
 cat > %{targetobj}.mk <<'EOF'
@@ -507,15 +500,11 @@
 # build reverse config and show diff
 %{__make} TARGETOBJ=%{targetobj} pykconfig
 diff -u %{_sourcedir}/kernel-xen0-multiarch.conf %{objdir}/kernel.conf || :
-%endif # arch build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# touch for noarch build (exclude list)
 install -d $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
-touch $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/{utsrelease,version,autoconf-dist}.h
 
-%if %{without noarch}
 %{__make} %{MakeOpts} %{!?with_verbose:-s} modules_install \
 	-C %{objdir} \
 	%{?with_verbose:V=1} \
@@ -561,14 +550,11 @@
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{kernel_release}
 
 # /usr/src/linux
-# maybe package these to -module-build, then -headers could be noarch
 cp -a %{objdir}/Module.symvers $RPM_BUILD_ROOT%{_kernelsrcdir}/Module.symvers-dist
 cp -aL %{objdir}/.config $RPM_BUILD_ROOT%{_kernelsrcdir}/config-dist
 cp -a %{objdir}/include/linux/autoconf.h $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf-dist.h
 cp -a %{objdir}/include/linux/{utsrelease,version}.h $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux
-%endif # arch dependant
 
-%if %{with noarch}
 # 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
@@ -578,7 +564,6 @@
 
 install -d $RPM_BUILD_ROOT/lib/modules/%{kernel_release}
 cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/config.h
-%endif # arch independant
 
 # collect module-build files and directories
 # Usage: kernel-module-build.pl $rpmdir $fileoutdir
@@ -672,7 +657,6 @@
 	rm -f /lib/modules/%{kernel_release}/{build,source}
 fi
 
-%if %{without noarch}
 %files
 %defattr(644,root,root,755)
 %ifarch sparc sparc64
@@ -891,9 +875,7 @@
 %{_kernelsrcdir}/include/linux/autoconf-dist.h
 %{_kernelsrcdir}/include/linux/utsrelease.h
 %{_kernelsrcdir}/include/linux/version.h
-%endif # noarch package
 
-%if %{with noarch}
 %files headers
 %defattr(644,root,root,755)
 %{_kernelsrcdir}/include
@@ -996,7 +978,6 @@
 %{_kernelsrcdir}/README
 %{_kernelsrcdir}/REPORTING-BUGS
 %endif
-%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -1004,6 +985,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2010/02/16 16:16:32  pawelz
+- dropped "noarch" bcond. Build everything as arch.
+
 Revision 1.3  2010/02/15 14:23:28  pawelz
 - EA: ix86, x86_64
 - TODO: drop non-x86 garbage
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-xen0/kernel-xen0.spec?r1=1.3&r2=1.4&f=u