From e6236b7bde28bc6738f760ac4f6acb262d282770 Mon Sep 17 00:00:00 2001 From: Chuck Ebbert Date: Fri, 11 Nov 2011 19:51:31 -0500 Subject: [PATCH] Use the same naming scheme as rawhide for -stable RC kernels (e.g. 3.1.1-0.rc1.1 instead of 3.1.1-1.rc1) --- .gitignore | 1 + kernel.spec | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2a459583a..98392fa4d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ linux-*.tar.bz2 patch-*.bz2 clog *.rpm +*.orig kernel-[23].*/ diff --git a/kernel.spec b/kernel.spec index f93eaac55..5bdb7e21d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -173,8 +173,10 @@ Summary: The Linux kernel %if 0%{?stable_rc} %define stable_rctag .rc%{stable_rc} +%define pkg_release 0%{stable_rctag}.%{fedora_build}%{?buildid}%{?dist} +%else +%define pkg_release %{fedora_build}%{?buildid}%{?dist} %endif -%define pkg_release %{fedora_build}%{?stable_rctag}%{?buildid}%{?dist} %else @@ -2055,6 +2057,10 @@ fi # ||----w | # || || %changelog +* Fri Nov 11 2011 Chuck Ebbert +- Use the same naming scheme as rawhide for -stable RC kernels + (e.g. 3.1.1-0.rc1.1 instead of 3.1.1-1.rc1) + * Fri Nov 11 2011 Josh Boyer - Add reworked pci ASPM patch from Matthew Garrett