rpms/kernel/devel linux-2.6.25.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.808, 1.809 kernel.spec, 1.619, 1.620 sources, 1.769, 1.770 upstream, 1.688, 1.689 linux-2.6.24.tar.bz2.sign, 1.1, NONE patch-2.6.25-rc9-git2.bz2.sign, 1.1, NONE patch-2.6.25-rc9.bz2.sign, 1.1, NONE

[Kyle McMartin (kyle)]

Author: kyle

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

Modified Files:
	.cvsignore kernel.spec sources upstream 
Added Files:
	linux-2.6.25.tar.bz2.sign 
Removed Files:
	linux-2.6.24.tar.bz2.sign patch-2.6.25-rc9-git2.bz2.sign 
	patch-2.6.25-rc9.bz2.sign 
Log Message:
* Thu Apr 17 2008 Kyle McMartin <kmcmartin at redhat.com>
- Linux 2.6.25
- linux-2.6-wireless.patch merged upstream



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

iD8DBQBIBsKGyGugalF9Dw4RAoBHAJ98cpucznFWEivkSLsEqyiMujJxWACfa3Qx
L6U28yAL2s2Dty9AOH5R4gs=
=948A
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.808
retrieving revision 1.809
diff -u -r1.808 -r1.809
--- .cvsignore	16 Apr 2008 06:06:14 -0000	1.808
+++ .cvsignore	17 Apr 2008 04:38:59 -0000	1.809
@@ -2,7 +2,5 @@
 GNUmakefile
 kernel-2.6.*.config
 temp-*
-kernel-2.6.24
-linux-2.6.24.tar.bz2
-patch-2.6.25-rc9.bz2
-patch-2.6.25-rc9-git2.bz2
+kernel-2.6.25
+linux-2.6.25.tar.bz2


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.619
retrieving revision 1.620
diff -u -r1.619 -r1.620
--- kernel.spec	16 Apr 2008 06:06:14 -0000	1.619
+++ kernel.spec	17 Apr 2008 04:38:59 -0000	1.620
@@ -3,7 +3,7 @@
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%define released_kernel 0
+%define released_kernel 1
 
 # Versions of various parts
 
@@ -20,13 +20,13 @@
 # kernel spec when the kernel is rebased, so fedora_build automatically
 # works out to the offset from the rebase, so it doesn't get too ginormous.
 #
-%define fedora_cvs_origin 384
+%define fedora_cvs_origin 619
 %define fedora_build %(R="$Revision$"; R="${R%% \$}"; R="${R##: 1.}"; expr $R - %{fedora_cvs_origin})
 
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
 # which yields a base_sublevel of 21.
-%define base_sublevel 24
+%define base_sublevel 25
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
@@ -43,9 +43,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 9
+%define rcrev 0
 # The git snapshot level
-%define gitrev 2
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -1119,7 +1119,7 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 
 # wireless patches headed for 2.6.25
-ApplyPatch linux-2.6-wireless.patch
+#ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.26
 ApplyPatch linux-2.6-wireless-pending.patch
 # rt2x00 configure_filter fix to avoid endless loop on insert for USB devices
@@ -1765,6 +1765,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Thu Apr 17 2008 Kyle McMartin <kmcmartin at redhat.com>
+- Linux 2.6.25
+- linux-2.6-wireless.patch merged upstream
+
 * Wed Apr 16 2008 Kyle McMartin <kmcmartin at redhat.com>
 - Linux 2.6.25-rc9-git2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.769
retrieving revision 1.770
diff -u -r1.769 -r1.770
--- sources	16 Apr 2008 06:06:14 -0000	1.769
+++ sources	17 Apr 2008 04:39:00 -0000	1.770
@@ -1,3 +1 @@
-3f23ad4b69d0a552042d1ed0f4399857  linux-2.6.24.tar.bz2
-bd9c3782deccd234b2c8df8c223347e9  patch-2.6.25-rc9.bz2
-c51550897315870e1ef6f92fe8d062b4  patch-2.6.25-rc9-git2.bz2
+db95a49a656a3247d4995a797d333153  linux-2.6.25.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.688
retrieving revision 1.689
diff -u -r1.688 -r1.689
--- upstream	16 Apr 2008 06:06:14 -0000	1.688
+++ upstream	17 Apr 2008 04:39:00 -0000	1.689
@@ -1,3 +1 @@
-linux-2.6.24.tar.bz2
-patch-2.6.25-rc9.bz2
-patch-2.6.25-rc9-git2.bz2
+linux-2.6.25.tar.bz2


--- linux-2.6.24.tar.bz2.sign DELETED ---


--- patch-2.6.25-rc9-git2.bz2.sign DELETED ---


--- patch-2.6.25-rc9.bz2.sign DELETED ---