[kernel/f15] Use the same naming scheme as rawhide for -stable RC kernels
Chuck Ebbert
cebbert at fedoraproject.org
Sat Nov 12 00:59:36 UTC 2011
commit 97c2a18ca64a28e87677dc784441cb6ced0fd997
Author: Chuck Ebbert <cebbert at redhat.com>
Date: Fri Nov 11 19:58:39 2011 -0500
Use the same naming scheme as rawhide for -stable RC kernels
.gitignore | 1 +
kernel.spec | 13 ++++++++++++-
2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a45958..98392fa 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 5dc0583..a0b801d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -137,8 +137,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}
# The kernel tarball/base version
%define realversion 3.%{real_sublevel}
@@ -896,6 +898,11 @@ exit 1
%endif
%endif
+%if !%{baserelease}
+echo "baserelease must be greater than zero"
+exit 1
+%endif
+
# more sanity checking; do it quietly
if [ "%{patches}" != "%%{patches}" ] ; then
for patch in %{patches} ; do
@@ -1858,6 +1865,10 @@ fi
# and build.
%changelog
+* Fri Nov 11 2011 Chuck Ebbert <cebbert at redhat.com>
+- Use the same naming scheme as rawhide for -stable RC kernels
+ (e.g. 2.6.41.1-0.rc1.1 instead of 2.6.41.1-1.rc1)
+
* Fri Nov 11 2011 Josh Boyer <jwboyer at redhat.com> 2.6.41.1-1
- Linux 3.1.1
More information about the scm-commits
mailing list