SPECS: kernel-vanilla.spec - hopefully fixed patch applying for bo...

[shadzik]

Author: shadzik                      Date: Thu Feb 22 05:13:45 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- hopefully fixed patch applying for both testing and stable versions

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.34 SPECS/kernel-vanilla.spec:1.35
--- SPECS/kernel-vanilla.spec:1.34	Mon Feb 19 08:29:26 2007
+++ SPECS/kernel-vanilla.spec	Thu Feb 22 06:13:39 2007
@@ -97,7 +97,7 @@
 # Source1-md5:	9b325c6086ad2a3fcde643f01a4c4640
 %endif
 %if "%{_ver}" != "%{nil}"
-Source1:	http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-%{_ver}-%{_rc}.bz2
+Source10:	http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-%{_ver}-%{_rc}.bz2
 # Source1-md5:	9b325c6086ad2a3fcde643f01a4c4640
 %endif
 
@@ -584,9 +584,12 @@
 %prep
 %setup -q -n linux-%{_basever}
 
-%if "%{_postver}" != "%{nil}" || "%{_ver}" != "%{nil}"
+%if "%{_postver}" != "%{nil}"
 %{__bzip2} -dc %{SOURCE1} | %{__patch} -p1 -s
 %endif
+%if "%{_ver}" != "%{nil}"
+%{__bzip2} -dc %{SOURCE10} | %{__patch} -p1 -s
+%endif
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}_%{alt_kernel}#g' Makefile
@@ -1305,6 +1308,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.35  2007/02/22 05:13:39  shadzik
+- hopefully fixed patch applying for both testing and stable versions
+
 Revision 1.34  2007/02/19 07:29:26  shadzik
 - fix versioning (version-.release issue <- the dot shouldn't be there)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel-vanilla.spec?r1=1.34&r2=1.35&f=u