rpms/kernel/F-9 kernel.spec,1.748,1.749

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28638

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


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.748
retrieving revision 1.749
diff -u -r1.748 -r1.749
--- kernel.spec	30 Aug 2008 08:58:15 -0000	1.748
+++ kernel.spec	30 Aug 2008 22:37:58 -0000	1.749
@@ -887,10 +887,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}
@@ -914,11 +910,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}
@@ -930,7 +922,6 @@
 ApplyPatch patch-2.6.%{base_sublevel}-git%{gitrev}.bz2
 %endif
 %endif
-%endif
 
  cd ..
 
@@ -950,6 +941,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
@@ -1798,6 +1794,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Sat Aug 30 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-22
+- specfile: don't use the latest stable update as the vanilla directory.
+
 * Sat Aug 30 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.3-21
 - x86: fix oprofile + hibernation badness (#459413)