summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Ebbert <cebbert@redhat.com>2010-08-18 19:44:48 -0400
committerChuck Ebbert <cebbert@redhat.com>2010-08-18 19:44:48 -0400
commitc3126dc3b565782fe7d81e6bdf45040d321928f9 (patch)
tree1de9e9f8db46f13df7d7f072b7a3e914943ff034
parentfba85b9bcad3f09f06cb366779decffd601486c3 (diff)
downloadkernel-c3126dc3b565782fe7d81e6bdf45040d321928f9.tar.gz
kernel-c3126dc3b565782fe7d81e6bdf45040d321928f9.tar.xz
kernel-c3126dc3b565782fe7d81e6bdf45040d321928f9.zip
Linux 2.6.36-rc1-git1
-rw-r--r--.gitignore1
-rw-r--r--kernel.spec10
-rw-r--r--sources1
3 files changed, 9 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 85d44c736..c2fd41347 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@ patch-*.bz2
clog
*.rpm
kernel-2.6.*/
-patch-2.6.36-rc1.bz2
diff --git a/kernel.spec b/kernel.spec
index de3fe39a0..7d0bdc2ce 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,10 @@ 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 2
+# For non-released -rc kernels, this will be prepended with "0.", so
+# for example a 3 here will become 0.3
+#
+%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -81,7 +84,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 1
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1862,6 +1865,9 @@ fi
# || ||
%changelog
+* Wed Aug 18 2010 Chuck Ebbert <cebbert@redhat.com>
+- Linux 2.6.36-rc1-git1
+
* Wed Aug 18 2010 Kyle McMartin <kmcmartin@redhat.com> - 2.6.36-0.2.rc1.git0
- Link perf against libnewt for TUI support.
diff --git a/sources b/sources
index efaf7e0cc..badea28c9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2
4f51963b5e076fb87ab32bda229a524f patch-2.6.36-rc1.bz2
+605f904e69fa5f67670505d8644ab47a patch-2.6.36-rc1-git1.bz2