rpms/kernel/F-10 patch-2.6.29-rc6.bz2.sign, NONE, 1.1 .cvsignore, 1.987, 1.988 kernel.spec, 1.1270, 1.1271 sources, 1.949, 1.950 upstream, 1.860, 1.861 patch-2.6.29-rc5-git5.bz2.sign, 1.1, NONE patch-2.6.29-rc5.bz2.sign, 1.1, NONE selinux-netlabel_setsockopt_fix.patch, 1.2, NONE

[Kyle McMartin]

Author: kyle

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

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc6.bz2.sign 
Removed Files:
	patch-2.6.29-rc5-git5.bz2.sign patch-2.6.29-rc5.bz2.sign 
	selinux-netlabel_setsockopt_fix.patch 
Log Message:
* Mon Feb 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.40.rc6
- Linux 2.6.29-rc6
- selinux-netlabel_setsockopt_fix.patch: drop merged upstream



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

iD8DBQBJoiiKyGugalF9Dw4RAlpdAJ4j5OowJYKawRud/sENIGHEouY0LgCcDmhc
EUCJWREfijZ67yQD6eIyUtQ=
=xMvZ
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.987
retrieving revision 1.988
diff -u -r1.987 -r1.988
--- .cvsignore	21 Feb 2009 19:19:58 -0000	1.987
+++ .cvsignore	23 Feb 2009 08:25:54 -0000	1.988
@@ -4,5 +4,4 @@
 temp-*
 kernel-2.6.28
 linux-2.6.28.tar.bz2
-patch-2.6.29-rc5.bz2
-patch-2.6.29-rc5-git5.bz2
+patch-2.6.29-rc6.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1270
retrieving revision 1.1271
diff -u -r1.1270 -r1.1271
--- kernel.spec	22 Feb 2009 18:12:41 -0000	1.1270
+++ kernel.spec	23 Feb 2009 08:25:55 -0000	1.1271
@@ -55,9 +55,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 5
+%define rcrev 6
 # The git snapshot level
-%define gitrev 5
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -619,7 +619,6 @@
 Patch530: linux-2.6-silence-fbcon-logo.patch
 Patch570: linux-2.6-selinux-mprotect-checks.patch
 Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
-Patch581: selinux-netlabel_setsockopt_fix.patch
 
 Patch591: linux-2.6-ext4-ENOSPC-debug.patch
 
@@ -1123,9 +1122,6 @@
 # Fix SELinux for sparc
 ApplyPatch linux-2.6-sparc-selinux-mprotect-checks.patch
 
-# bz486225: fix setsockopt when netlabel is enabled
-ApplyPatch selinux-netlabel_setsockopt_fix.patch
-
 # Changes to upstream defaults.
 
 # squelch hda_beep by default
@@ -1751,6 +1747,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Feb 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.40.rc6
+- Linux 2.6.29-rc6
+- selinux-netlabel_setsockopt_fix.patch: drop merged upstream
+
 * Sun Feb 22 2009 Kyle McMartin <kyle at redhat.com>
 - Add patch from Paul Moore to fix setsockopt when netlabel is in use (ie:
    when selinux is enabled.) resolves bz#486225.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.949
retrieving revision 1.950
diff -u -r1.949 -r1.950
--- sources	21 Feb 2009 19:20:03 -0000	1.949
+++ sources	23 Feb 2009 08:25:55 -0000	1.950
@@ -1,3 +1,2 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-60193569887cb6fe98b9c0d483f911e7  patch-2.6.29-rc5.bz2
-8edc24cae6dfbf6913381087692b16a6  patch-2.6.29-rc5-git5.bz2
+26f67d99666834cc579094619821d3c8  patch-2.6.29-rc6.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.860
retrieving revision 1.861
diff -u -r1.860 -r1.861
--- upstream	21 Feb 2009 19:20:03 -0000	1.860
+++ upstream	23 Feb 2009 08:25:56 -0000	1.861
@@ -1,3 +1,2 @@
 linux-2.6.28.tar.bz2
-patch-2.6.29-rc5.bz2
-patch-2.6.29-rc5-git5.bz2
+patch-2.6.29-rc6.bz2


--- patch-2.6.29-rc5-git5.bz2.sign DELETED ---


--- patch-2.6.29-rc5.bz2.sign DELETED ---


--- selinux-netlabel_setsockopt_fix.patch DELETED ---