SPECS: kernel-desktop.spec - um, no vmlinux on th-ppc

[glen]

Author: glen                         Date: Sat Jan 19 18:22:41 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- um, no vmlinux on th-ppc

---- Files affected:
SPECS:
   kernel-desktop.spec (1.149 -> 1.150) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.149 SPECS/kernel-desktop.spec:1.150
--- SPECS/kernel-desktop.spec:1.149	Sat Jan 19 18:35:38 2008
+++ SPECS/kernel-desktop.spec	Sat Jan 19 19:22:36 2008
@@ -48,14 +48,11 @@
 %define		have_isa	0
 %endif
 
-%define		netfilter_snap		20061213
-
 %define		_enable_debug_packages			0
-%define		no_install_post_strip			1
-%define		no_install_post_chrpath			1
 
 %define		suspend_version		2.2.10.2
 %define		suspend_kernel		%{_basever}-rc6
+%define		netfilter_snap		20061213
 
 %if %{with laptop}
 %define		alt_kernel	laptop%{?with_preemptrt:_rt}
@@ -259,7 +256,9 @@
 Conflicts:	ppp < 1:2.4.0
 Conflicts:	procps < 3.2.0
 Conflicts:	quota-tools < 3.09
+%if %{with reiserfs4}
 Conflicts:	reiser4progs < 1.0.0
+%endif
 Conflicts:	reiserfsprogs < 3.6.3
 Conflicts:	udev < 071
 Conflicts:	util-linux < 2.10o
@@ -270,6 +269,7 @@
 
 # No ELF objects there to strip (skips processing 27k files)
 %define		_noautostrip	.*%{_kernelsrcdir}/.*
+%define		_noautochrpath	.*%{_kernelsrcdir}/.*
 
 %define		initrd_dir	/boot
 
@@ -955,9 +955,11 @@
 %ghost /lib/modules/%{kernel_release}/modules.*
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
+%ifarch alpha %{ix86} %{x8664} sparc sparc64
 %files vmlinux
 %defattr(644,root,root,755)
 /boot/vmlinux-%{kernel_release}
+%endif
 
 %files drm
 %defattr(644,root,root,755)
@@ -1065,6 +1067,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.150  2008-01-19 18:22:36  glen
+- um, no vmlinux on th-ppc
+
 Revision 1.149  2008-01-19 17:35:38  glen
 - now that there's only main one package, drop version macros
 
================================================================

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