SPECS: kernel-desktop.spec - renum sources to avoid collision - NO...

[glen]

Author: glen                         Date: Wed Apr  9 00:36:27 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- renum sources to avoid collision
- NOTE: ck patch swappiness patch makes unresolved syms

---- Files affected:
SPECS:
   kernel-desktop.spec (1.176 -> 1.177) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.176 SPECS/kernel-desktop.spec:1.177
--- SPECS/kernel-desktop.spec:1.176	Wed Apr  9 02:08:34 2008
+++ SPECS/kernel-desktop.spec	Wed Apr  9 02:36:22 2008
@@ -80,18 +80,15 @@
 # Source0-md5:	3f23ad4b69d0a552042d1ed0f4399857
 Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
 # Source1-md5:	508f5aaa99dead9836ff490496a61581
-Source19:	kernel-vanilla-module-build.pl
-Source20:	kernel-config.py
-Source21:	kernel-config-update.py
-Source22:	kernel-multiarch.make
-
-Source3:	%{pname}-autoconf.h
-Source4:	%{pname}-config.h
-Source5:	%{pname}-module-build.pl
-Source6:	%{pname}-common.config
-Source7:	%{pname}-i386.config
-Source8:	%{pname}-x86_64.config
-Source9:	%{pname}-ppc.config
+Source2:	kernel-vanilla-module-build.pl
+Source3:	kernel-config.py
+Source4:	kernel-config-update.py
+Source5:	kernel-multiarch.make
+Source6:	%{pname}-autoconf.h
+Source7:	%{pname}-config.h
+Source8:	%{pname}-module-build.pl
+
+Source9:	%{pname}-common.config
 Source10:	%{pname}-preempt-rt.config
 Source11:	%{pname}-preempt-nort.config
 Source12:	%{pname}-tuxonice.config
@@ -542,10 +539,10 @@
 %prep
 %setup -qc
 install -d o/scripts
-ln -s %{SOURCE19} o/scripts/kernel-module-build.pl
-ln -s %{SOURCE20} o/scripts/kernel-config.py
-ln -s %{SOURCE21} o/scripts/kernel-config-update.py
-ln -s %{SOURCE22} Makefile
+ln -s %{SOURCE2} o/scripts/kernel-module-build.pl
+ln -s %{SOURCE3} o/scripts/kernel-config.py
+ln -s %{SOURCE4} o/scripts/kernel-config-update.py
+ln -s %{SOURCE5} Makefile
 
 cd linux-%{_basever}
 %if "%{_postver}" != "%{nil}"
@@ -716,7 +713,6 @@
 MAKE_OPTS	:= %{MakeOpts}
 
 CONFIGS += %{_sourcedir}/%{pname}-common.config
-CONFIGS += %{_sourcedir}/%{pname}-%{_target_base_arch}.config
 
 # preempt
 %if %{with preemptrt}
@@ -915,8 +911,8 @@
 cp -a$l %{srcdir}/* $RPM_BUILD_ROOT%{_kernelsrcdir}
 
 install -d $RPM_BUILD_ROOT/lib/modules/%{kernel_release}
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/config.h
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf.h
+cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/config.h
+cp -a %{SOURCE6} $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/autoconf.h
 
 # collect module-build files and directories
 # Usage: kernel-module-build.pl $rpmdir $fileoutdir
@@ -1164,6 +1160,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.177  2008-04-09 00:36:22  glen
+- renum sources to avoid collision
+- NOTE: ck patch swappiness patch makes unresolved syms
+
 Revision 1.176  2008-04-09 00:08:34  zbyniu
 - udev epoch
 
================================================================

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