rpms/kernel/devel kernel.spec,1.1006,1.1007

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25500

Modified Files:
	kernel.spec 
Log Message:
specfile: don't use the latest stable update for the vanilla directory.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1006
retrieving revision 1.1007
diff -u -r1.1006 -r1.1007
--- kernel.spec	3 Oct 2008 13:00:43 -0000	1.1006
+++ kernel.spec	3 Oct 2008 15:33:25 -0000	1.1007
@@ -865,10 +865,6 @@
 # Update to latest upstream.
 %if 0%{?released_kernel}
 %define vanillaversion 2.6.%{base_sublevel}
-# released_kernel with stable_update available case
-%if 0%{?stable_update}
-%define vanillaversion 2.6.%{base_sublevel}.%{stable_update}
-%endif
 # non-released_kernel case
 %else
 %if 0%{?rcrev}
@@ -910,11 +906,7 @@
   cd vanilla-%{vanillaversion}
 
 # Update vanilla to the latest upstream.
-# released_kernel with stable_update available case
-%if 0%{?stable_update}
-ApplyPatch patch-2.6.%{base_sublevel}.%{stable_update}.bz2
-# non-released_kernel case
-%else
+# (non-released_kernel case only)
 %if 0%{?rcrev}
 ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2
 %if 0%{?gitrev}
@@ -926,7 +918,6 @@
 ApplyPatch patch-2.6.%{base_sublevel}-git%{gitrev}.bz2
 %endif
 %endif
-%endif
 
   cd ..
 
@@ -947,6 +938,11 @@
 
 cd linux-%{kversion}.%{_target_cpu}
 
+# released_kernel with stable_update available case
+%if 0%{?stable_update}
+ApplyPatch patch-2.6.%{base_sublevel}.%{stable_update}.bz2
+%endif
+
 %if %{using_upstream_branch}
 ### BRANCH APPLY ###
 %endif
@@ -1747,6 +1743,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Oct 03 2008 Chuck Ebbert <cebbert at redhat.com>
+- specfile: don't use the latest stable update for the vanilla directory.
+
 * Fri Oct 03 2008 Kyle McMartin <kyle at redhat.com>
 - 2.6.27-rc8-git5