diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-31 15:18:49 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-31 15:18:49 +0200 |
commit | 89964532af24450f52b6d01dacd294217911419e (patch) | |
tree | 6107bc5d1b68f05be5192c06027349030291ed60 /kernel.spec | |
parent | 3dfb76094b2877be42c5c59e3dd88c08a12dfe54 (diff) | |
parent | b41e8da84d859a942949cba537c8ea69d0e87df4 (diff) | |
download | kernel-89964532af24450f52b6d01dacd294217911419e.tar.gz kernel-89964532af24450f52b6d01dacd294217911419e.tar.xz kernel-89964532af24450f52b6d01dacd294217911419e.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc3.1.vanilla.2.fc34kernel-5.9.0-0.rc3.1.vanilla.2.fc33kernel-5.9.0-0.rc3.1.vanilla.2.fc32kernel-5.9.0-0.rc3.1.vanilla.2.fc31
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 7b06d0365..245abecf0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -30,7 +30,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc2.20200827git15bc20c6af4c.1 +%global distro_build 0.rc3.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,13 +71,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.9.0 -%define pkgrelease 0.rc2.20200827git15bc20c6af4c.1 +%define pkgrelease 0.rc3.1 # This is needed to do merge window version magic %define patchlevel 9 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20200827git15bc20c6af4c.1%{?buildid}%{?dist} +%define specrelease 0.rc3.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -569,7 +569,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200827git15bc20c6af4c.tar.xz +Source0: linux-5.9-rc3.tar.xz Source1: Makefile.rhelver @@ -1286,8 +1286,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200827git15bc20c6af4c -c -mv linux-20200827git15bc20c6af4c linux-%{KVERREL} +%setup -q -n kernel-5.9-rc3 -c +mv linux-5.9-rc3 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2785,6 +2785,19 @@ fi # # %changelog +* Mon Aug 31 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.1] +- v5.9-rc3 rebase +- Updated changelog for the release based on 1127b219ce94 (Fedora Kernel Team) + +* Sun Aug 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc2.20200830git1127b219ce94.1] +- 1127b219ce94 rebase +- Updated changelog for the release based on 4d41ead6ead9 (Fedora Kernel Team) + +* Sat Aug 29 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc2.20200829git4d41ead6ead9.1] +- 4d41ead6ead9 rebase +- mod-sign.sh: Fix syntax flagged by shellcheck (Ben Crocker) +- Updated changelog for the release based on 15bc20c6af4c (Fedora Kernel Team) + * Thu Aug 27 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc2.20200827git15bc20c6af4c.1] - 15bc20c6af4c rebase - Updated changelog for the release based on 2ac69819ba9e (Fedora Kernel Team) |