rpms/kernel/FC-4 kernel-2.6.spec,1.1385,1.1385.2.1

[fedora-cvs-commits at redhat.com]

Author: linville

Update of /cvs/dist/rpms/kernel/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv23199

Modified Files:
      Tag: private-linville-fc4-jwltest-8-branch
	kernel-2.6.spec 
Log Message:



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v
retrieving revision 1.1385
retrieving revision 1.1385.2.1
diff -u -r1.1385 -r1.1385.2.1
--- kernel-2.6.spec	27 Jun 2005 20:53:43 -0000	1.1385
+++ kernel-2.6.spec	27 Jun 2005 21:11:51 -0000	1.1385.2.1
@@ -24,7 +24,8 @@
 %define sublevel 12
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+#%define rhbsys  %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`)
+%define rhbsys .jwltest.8
 %if %{FC3}
 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC3%{rhbsys}
 %endif
@@ -163,7 +164,8 @@
 License: GPLv2
 Version: %{rpmversion}
 Release: %{release}
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64iseries sparc sparc64
+#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64iseries sparc sparc64
+ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ppc64iseries ppc
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -306,6 +308,7 @@
 Patch1301: linux-2.6.12-net-sundance-ip100A.patch
 Patch1302: linux-2.6.12-net-make-orinoco-suck-less.patch
 Patch1304: linux-2.6.12-net-atm-lanai-nodev-rmmod.patch
+Patch1305: jwltest-b44-link-check.patch
 
 # USB bits
 Patch1400: linux-2.6.12-usb-old_scheme_first.patch
@@ -343,6 +346,8 @@
 Patch1890: linux-2.6.12-firedire-init-breakage.patch 
 Patch1900: linux-2.6.12-pwc-warning.patch
 Patch1910: linux-2.6.12-ns558-nodev-rmmod.patch
+Patch1920: jwltest-tpm-fixes.patch
+Patch1930: jwltest-acpi-dsdt-initrd.patch
 
 Patch2000: linux-2.6.11-vm-taint.patch
 Patch2001: linux-2.6.9-vm-oomkiller-debugging.patch
@@ -358,6 +363,7 @@
 Patch3020: linux-2.6.9-ipw2100.patch
 Patch3021: linux-2.6.9-ipw2200.patch
 Patch3022: linux-2.6.9-ieee80211.patch
+Patch3023: jwltest-ipw2100-1_1_0.patch
 
 #
 # 10000 to 20000 is for stuff that has to come last due to the
@@ -724,6 +730,8 @@
 %patch1302 -p1
 # Fix rmmod lanai
 %patch1304 -p1
+# b44 early link check
+%patch1305 -p1
 
 # USB Bits.
 # Enable both old and new style USB initialisation.
@@ -793,6 +801,10 @@
 %patch1900 -p1
 # Fix oops in ns558 on rmmod
 %patch1910 -p1
+# TPM fixes
+%patch1920 -p1
+# Add DSDT override from initrd
+%patch1930 -p1
 
 #
 # VM related fixes.
@@ -820,6 +832,7 @@
 %patch3020 -p1
 %patch3021 -p1
 %patch3022 -p1
+%patch3023 -p1 -E
 
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to