summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2012-01-13 10:05:56 -0500
committerJosh Boyer <jwboyer@redhat.com>2012-01-13 10:05:56 -0500
commitfdb68da43b60ef7d2a19bbe2b56728d9db25566d (patch)
tree3f9f7aaf69193e28756817711d18fe031eaa1064
parent34e654d965567266d78919d448a797e55f6ec266 (diff)
downloadkernel-fdb68da43b60ef7d2a19bbe2b56728d9db25566d.tar.gz
kernel-fdb68da43b60ef7d2a19bbe2b56728d9db25566d.tar.xz
kernel-fdb68da43b60ef7d2a19bbe2b56728d9db25566d.zip
Linux 3.1.2
Change stable patch compression format to xz
-rw-r--r--kernel.spec10
-rw-r--r--sources1
2 files changed, 8 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index e6fecde65..cf203e387 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 4
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -66,7 +66,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 0
+%define stable_update 1
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -615,7 +615,7 @@ Source2001: cpupower.config
# For a stable release kernel
%if 0%{?stable_update}
%if 0%{?stable_base}
-%define stable_patch_00 patch-3.%{base_sublevel}.%{stable_base}.bz2
+%define stable_patch_00 patch-3.%{base_sublevel}.%{stable_base}.xz
Patch00: %{stable_patch_00}
%endif
%if 0%{?stable_rc}
@@ -2301,6 +2301,10 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Jan 13 2012 Josh Boyer <jwboyer@redhat.com> 3.2.1-1
+- Linux 3.1.2
+- Change stable patch compression format to xz
+
* Wed Jan 11 2012 Josh Boyer <jwboyer@redhat.com>
- Patch from Stanislaw Gruszka to fix NULL ptr deref in mac80211 (rhbz 769766)
diff --git a/sources b/sources
index 8c792a50e..a1118d75d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
364066fa18767ec0ae5f4e4abcf9dc51 linux-3.2.tar.xz
2fed18362598429cc0669c01123290ff compat-wireless-2012-01-09.tar.bz2
+62ac6ac9b870162f693ecf5e8606423a patch-3.2.1.xz