rpms/kernel/devel patch-2.6.26-rc4-git4.bz2.sign, NONE, 1.1 .cvsignore, 1.826, 1.827 config-generic, 1.107, 1.108 kernel.spec, 1.671, 1.672 sources, 1.786, 1.787 upstream, 1.705, 1.706 patch-2.6.26-rc4-git2.bz2.sign, 1.1, NONE

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27419

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.26-rc4-git4.bz2.sign 
Removed Files:
	patch-2.6.26-rc4-git2.bz2.sign 
Log Message:
2.6.26-rc4-git4


--- NEW FILE patch-2.6.26-rc4-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBIQFAzyGugalF9Dw4RAv7TAJ96r9XhUg99n3kcrz2yyKqscq+LgwCeIdSN
WekK4XDaN7xwzw8I7sor/bw=
=W312
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -r1.826 -r1.827
--- .cvsignore	30 May 2008 03:26:59 -0000	1.826
+++ .cvsignore	2 Jun 2008 22:35:27 -0000	1.827
@@ -5,4 +5,4 @@
 kernel-2.6.25
 linux-2.6.25.tar.bz2
 patch-2.6.26-rc4.bz2
-patch-2.6.26-rc4-git2.bz2
+patch-2.6.26-rc4-git4.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- config-generic	25 May 2008 18:51:13 -0000	1.107
+++ config-generic	2 Jun 2008 22:35:27 -0000	1.108
@@ -2759,6 +2759,7 @@
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
 CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_LCD=m
 CONFIG_USB_LD=m
 CONFIG_USB_LEGOTOWER=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.671
retrieving revision 1.672
diff -u -r1.671 -r1.672
--- kernel.spec	2 Jun 2008 20:41:22 -0000	1.671
+++ kernel.spec	2 Jun 2008 22:35:27 -0000	1.672
@@ -45,7 +45,7 @@
 # The rc snapshot level
 %define rcrev 4
 # The git snapshot level
-%define gitrev 2
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1132,7 +1132,7 @@
 ApplyPatch linux-2.6-selinux-new-proc-checks.patch
 
 # wireless patches headed for 2.6.26
-ApplyPatch linux-2.6-wireless.patch
+#ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.27
 ApplyPatch linux-2.6-wireless-pending.patch
 # revert misguided commit 2218228392080f0ca2fc2974604e79f57b12c436
@@ -1779,6 +1779,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
+* Mon Jun 02 2008 Dave Jones <davej at redhat.com>
+- 2.6.26-rc4-git4
+
 * Mon Jun 02 2008 Jarod Wilson <jwilson at redhat.com>
 - Updated lirc patch with latest upstream changes and 2.6.26 compat
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.786
retrieving revision 1.787
diff -u -r1.786 -r1.787
--- sources	28 May 2008 20:33:45 -0000	1.786
+++ sources	2 Jun 2008 22:35:27 -0000	1.787
@@ -1,3 +1,3 @@
 db95a49a656a3247d4995a797d333153  linux-2.6.25.tar.bz2
 b5f96d823b1183ba0c4e61516e1a23c0  patch-2.6.26-rc4.bz2
-300d5952abbdd9f0c91b695f8a6921a5  patch-2.6.26-rc4-git2.bz2
+793537f9061129f4a39baf98c71fa6db  patch-2.6.26-rc4-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.705
retrieving revision 1.706
diff -u -r1.705 -r1.706
--- upstream	28 May 2008 20:33:45 -0000	1.705
+++ upstream	2 Jun 2008 22:35:27 -0000	1.706
@@ -1,3 +1,3 @@
 linux-2.6.25.tar.bz2
 patch-2.6.26-rc4.bz2
-patch-2.6.26-rc4-git2.bz2
+patch-2.6.26-rc4-git4.bz2


--- patch-2.6.26-rc4-git2.bz2.sign DELETED ---