rpms/kernel/F-13 .cvsignore, 1.1171, 1.1172 kernel.spec, 1.1936, 1.1937 sources, 1.1130, 1.1131 upstream, 1.1043, 1.1044
Kyle McMartin
kyle at fedoraproject.org
Wed Feb 24 19:32:06 UTC 2010
Author: kyle
Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8976
Modified Files:
.cvsignore kernel.spec sources upstream
Log Message:
* Wed Feb 24 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-1
- Linux 2.6.33
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/.cvsignore,v
retrieving revision 1.1171
retrieving revision 1.1172
diff -u -p -r1.1171 -r1.1172
--- .cvsignore 24 Feb 2010 19:28:06 -0000 1.1171
+++ .cvsignore 24 Feb 2010 19:32:05 -0000 1.1172
@@ -3,7 +3,5 @@ clog
GNUmakefile
kernel-2.6.*.config
temp-*
-kernel-2.6.32
-linux-2.6.32.tar.bz2
-patch-2.6.33-rc8.bz2
-patch-2.6.33-rc8-git9.bz2
+kernel-2.6.33
+linux-2.6.33.tar.bz2
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.1936
retrieving revision 1.1937
diff -u -p -r1.1936 -r1.1937
--- kernel.spec 24 Feb 2010 19:28:08 -0000 1.1936
+++ kernel.spec 24 Feb 2010 19:32:06 -0000 1.1937
@@ -6,7 +6,7 @@ Summary: The Linux kernel
# 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.
-%global released_kernel 0
+%global released_kernel 1
# Versions of various parts
@@ -27,14 +27,14 @@ Summary: The Linux kernel
# 1.1205.1.1. In this case we drop the initial 1, subtract fedora_cvs_origin
# from the second number, and then append the rest of the RCS string as is.
# Don't stare at the awk too long, you'll go blind.
-%define fedora_cvs_origin 1883
+%define fedora_cvs_origin 1936
%define fedora_cvs_revision() %2
%global fedora_build %(echo %{fedora_cvs_origin}.%{fedora_cvs_revision $Revision$} | awk -F . '{ OFS = "."; ORS = ""; print $3 - $1 ; i = 4 ; OFS = ""; while (i <= NF) { print ".", $i ; i++} }')
# 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 32
+%define base_sublevel 33
## If this is a released kernel ##
%if 0%{?released_kernel}
@@ -59,9 +59,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 8
+%define rcrev 0
# The git snapshot level
-%define gitrev 9
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1987,6 +1987,9 @@ fi
# and build.
%changelog
+* Wed Feb 24 2010 Kyle McMartin <kyle at redhat.com> 2.6.33-1
+- Linux 2.6.33
+
* Wed Feb 24 2010 Dave Jones <davej at redhat.com> 2.6.33-0.53.rc8.git9
- 2.6.33-rc8-git9
- dropped: drm-nouveau-old-vgaload.patch - merged upstream.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/sources,v
retrieving revision 1.1130
retrieving revision 1.1131
diff -u -p -r1.1130 -r1.1131
--- sources 24 Feb 2010 19:28:09 -0000 1.1130
+++ sources 24 Feb 2010 19:32:06 -0000 1.1131
@@ -1,3 +1 @@
-260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
-adce988e2e7103cdb8c7024c73bcff47 patch-2.6.33-rc8.bz2
-aa3d6161c1838091c684470e767060e9 patch-2.6.33-rc8-git9.bz2
+c3883760b18d50e8d78819c54d579b00 linux-2.6.33.tar.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/upstream,v
retrieving revision 1.1043
retrieving revision 1.1044
diff -u -p -r1.1043 -r1.1044
--- upstream 24 Feb 2010 19:28:09 -0000 1.1043
+++ upstream 24 Feb 2010 19:32:06 -0000 1.1044
@@ -1,3 +1 @@
-linux-2.6.32.tar.bz2
-patch-2.6.33-rc8.bz2
-patch-2.6.33-rc8-git9.bz2
+linux-2.6.33.tar.bz2
More information about the scm-commits
mailing list