From 67e704894991a2aede9fa2ea233d6a983c40f65e Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Sun, 1 Aug 2010 20:50:01 -0400 Subject: [PATCH] Rebase to final 2.6.35 --- .gitignore | 1 + kernel.spec | 11 +++++++---- sources | 4 +--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 2e1ce1c52..39eeb994a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog *.rpm kernel-2.6.*/ patch-2.6.35-rc6-git6.bz2 +linux-2.6.35.tar.bz2 diff --git a/kernel.spec b/kernel.spec index 8bfc4284f..4878d6a66 100644 --- a/kernel.spec +++ b/kernel.spec @@ -48,13 +48,13 @@ Summary: The Linux kernel # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec). # scripts/rebase.sh should be made to do that for you, actually. # -%global baserelease 58 +%global baserelease 0 %global fedora_build %{baserelease} # 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 34 +%define base_sublevel 35 ## If this is a released kernel ## %if 0%{?released_kernel} @@ -79,9 +79,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 6 +%define rcrev 0 # The git snapshot level -%define gitrev 6 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1866,6 +1866,9 @@ fi # || || %changelog +* Sun Aug 01 2010 Dave Jones +- Linux 2.6.35 + * Sun Aug 01 2010 Dave Jones - 2.6.35-rc6-git6 diff --git a/sources b/sources index fb6427456..1cb4ebe00 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -10eebcb0178fb4540e2165bfd7efc7ad linux-2.6.34.tar.bz2 -1205481c8d1b5ccecad87840ddaeaf81 patch-2.6.35-rc6.bz2 -f73d01927a3150e729b44add5ea4923c patch-2.6.35-rc6-git6.bz2 +091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2