rpms/kernel/F-9 kernel.spec,1.649,1.650

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4096

Modified Files:
	kernel.spec 
Log Message:
* Wed May 21 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.4-31
- Clean up specfile a bit.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.649
retrieving revision 1.650
diff -u -r1.649 -r1.650
--- kernel.spec	21 May 2008 20:52:41 -0000	1.649
+++ kernel.spec	21 May 2008 22:47:37 -0000	1.650
@@ -609,8 +609,13 @@
 Patch411: linux-2.6-alsa-hda-codec-add-AD1884A-mobile.patch
 Patch411: linux-2.6-alsa-hda-codec-add-AD1884A.patch
 Patch413: linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch
-Patch415: linux-2.6-cifs-fix-unc-path-prefix.patch
-Patch420: linux-2.6-squashfs.patch
+
+# filesystem patches
+Patch420: linux-2.6-cifs-fix-unc-path-prefix.patch
+Patch421: linux-2.6-squashfs.patch
+Patch422: linux-2.6-ext34-xattr-fix.patch
+Patch423: linux-2.6-xfs-small-buffer-reads.patch
+
 Patch430: linux-2.6-net-silence-noisy-printks.patch
 Patch431: linux-2.6-net-iptables-add-xt_iprange-aliases.patch
 Patch450: linux-2.6-input-kill-stupid-messages.patch
@@ -654,10 +659,6 @@
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
 
-# filesystem patches
-Patch2100: linux-2.6-ext34-xattr-fix.patch
-Patch2101: linux-2.6-xfs-small-buffer-reads.patch
-
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
@@ -1043,10 +1044,10 @@
 #
 # PowerPC
 #
-###  UPSTREAM PATCHES FROM 2.6.25 (we think):
+###  UPSTREAM PATCHES:
+### NOT (YET) UPSTREAM:
 # RTC class driver for ppc_md rtc functions
 ApplyPatch linux-2.6-ppc-rtc.patch
-### NOT (YET) UPSTREAM:
 # The EHCI ISO patch isn't yet upstream but is needed to fix reboot
 ApplyPatch linux-2.6-ps3-ehci-iso.patch
 # Fixes some wireless optical mice
@@ -1135,9 +1136,11 @@
 # Filesystem patches.
 # cifs
 ApplyPatch linux-2.6-cifs-fix-unc-path-prefix.patch
-
 # Squashfs
 ApplyPatch linux-2.6-squashfs.patch
+# more filesystem patches
+ApplyPatch linux-2.6-ext34-xattr-fix.patch
+ApplyPatch linux-2.6-xfs-small-buffer-reads.patch
 
 # Networking
 # Disable easy to trigger printk's.
@@ -1200,10 +1203,6 @@
 
 ApplyPatch linux-2.6-netdev-atl2.patch
 
-# filesystem patches
-ApplyPatch linux-2.6-ext34-xattr-fix.patch
-ApplyPatch linux-2.6-xfs-small-buffer-reads.patch
-
 # Nouveau DRM + drm fixes
 ApplyPatch linux-2.6-drm-git-mm.patch
 ApplyPatch nouveau-drm.patch
@@ -1825,6 +1824,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
+* Wed May 21 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.4-31
+- Clean up specfile a bit.
+
 * Wed May 21 2008 John W. Linville <linville at redhat.com> 2.6.25.4-30
 - libertas: Fix ethtool statistics
 - mac80211: fix NULL pointer dereference in ieee80211_compatible_rates