diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-24 16:26:27 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-24 16:26:27 +0200 |
| commit | 3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e (patch) | |
| tree | f49795de3f8aaae86e73f6a1f21b7b1948048311 /kernel.spec | |
| parent | c01e23554af1d0635829396c9b8b7f5040a2d7d3 (diff) | |
| parent | 427e0b0cd9f365866f7b2517c77ed712f5df9cc7 (diff) | |
| download | kernel-3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e.tar.gz kernel-3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e.tar.xz kernel-3e69d0c28fcf4dae0d7996b65e1849ef0d0da70e.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc2.1.vanilla.2.fc34kernel-5.9.0-0.rc2.1.vanilla.2.fc33kernel-5.9.0-0.rc2.1.vanilla.2.fc32kernel-5.9.0-0.rc2.1.vanilla.2.fc31
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index fbe7a2425..1495a47d7 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.rc1.20200821gitda2968ff879b.1 +%global distro_build 0.rc2.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.rc1.20200821gitda2968ff879b.1 +%define pkgrelease 0.rc2.1 # This is needed to do merge window version magic %define patchlevel 9 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20200821gitda2968ff879b.1%{?buildid}%{?dist} +%define specrelease 0.rc2.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-20200821gitda2968ff879b.tar.xz +Source0: linux-5.9-rc2.tar.xz Source1: Makefile.rhelver @@ -1286,8 +1286,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200821gitda2968ff879b -c -mv linux-20200821gitda2968ff879b linux-%{KVERREL} +%setup -q -n kernel-5.9-rc2 -c +mv linux-5.9-rc2 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2785,6 +2785,18 @@ fi # # %changelog +* Mon Aug 24 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc2.1] +- v5.9-rc2 rebase +- Updated changelog for the release based on c3d8f220d012 (Fedora Kernel Team) + +* Sun Aug 23 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc1.20200823gitc3d8f220d012.1] +- c3d8f220d012 rebase +- Updated changelog for the release based on f873db9acd3c (Fedora Kernel Team) + +* Sat Aug 22 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc1.20200822gitf873db9acd3c.1] +- f873db9acd3c rebase +- Updated changelog for the release based on da2968ff879b (Fedora Kernel Team) + * Fri Aug 21 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc1.20200821gitda2968ff879b.1] - da2968ff879b rebase - Temporarily remove cdomain from sphinx documentation ("Justin M. Forbes") |