diff options
| -rw-r--r-- | kernel.spec | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 763d76909..43f4036c5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -1372,11 +1372,10 @@ BuildKernel() { # make sure EXTRAVERSION says what we want it to say perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile - # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme - ### XXX this will probably be dead code in 3.0 --kyle + # if pre-rc1 devel kernel, must fix up PATCHLEVEL for our versioning scheme %if !0%{?rcrev} %if 0%{?gitrev} - perl -p -i -e 's/^SUBLEVEL.*/SUBLEVEL = %{upstream_sublevel}/' Makefile + perl -p -i -e 's/^PATCHLEVEL.*/PATCHLEVEL = %{upstream_sublevel}/' Makefile %endif %endif @@ -1878,6 +1877,9 @@ fi %changelog * Fri Jul 29 2011 Josh Boyer <jwboyer@redhat.com> +- Adjust Makefile sedding to account for 3.x release style + +* Fri Jul 29 2011 Josh Boyer <jwboyer@redhat.com> - Linux 3.0-git11 - Backport patch to correct udlfb removal events (rhbz 726163) |