diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-03 06:47:01 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-09-03 06:47:01 +0200 |
commit | b006d4c8a7650c95a1504f20f82569221ad8db24 (patch) | |
tree | c1f49e209915c6f4a2574303323a0fb63ea45082 /kernel.spec | |
parent | 82caceb61ea63124ff4697e630833bba0b61eccc (diff) | |
parent | 6493c5a9c4cf782738a690a9691f6cf64e847dcd (diff) | |
download | kernel-b006d4c8a7650c95a1504f20f82569221ad8db24.tar.gz kernel-b006d4c8a7650c95a1504f20f82569221ad8db24.tar.xz kernel-b006d4c8a7650c95a1504f20f82569221ad8db24.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc3.20200902git9c7d619be5a0.1.vanilla.2.fc34kernel-5.9.0-0.rc3.20200902git9c7d619be5a0.1.vanilla.2.fc33kernel-5.9.0-0.rc3.20200902git9c7d619be5a0.1.vanilla.2.fc32kernel-5.9.0-0.rc3.20200902git9c7d619be5a0.1.vanilla.2.fc31
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index adc6aab56..2fce1c985 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.rc3.20200901gitb51594df17d0.1 +%global distro_build 0.rc3.20200902git9c7d619be5a0.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.rc3.20200901gitb51594df17d0.1 +%define pkgrelease 0.rc3.20200902git9c7d619be5a0.1 # This is needed to do merge window version magic %define patchlevel 9 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20200901gitb51594df17d0.1%{?buildid}%{?dist} +%define specrelease 0.rc3.20200902git9c7d619be5a0.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-20200901gitb51594df17d0.tar.xz +Source0: linux-20200902git9c7d619be5a0.tar.xz Source1: Makefile.rhelver @@ -1287,8 +1287,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200901gitb51594df17d0 -c -mv linux-20200901gitb51594df17d0 linux-%{KVERREL} +%setup -q -n kernel-20200902git9c7d619be5a0 -c +mv linux-20200902git9c7d619be5a0 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2787,6 +2787,10 @@ fi # # %changelog +* Wed Sep 02 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200902git9c7d619be5a0.1] +- 9c7d619be5a0 rebase +- Updated changelog for the release based on b51594df17d0 (Fedora Kernel Team) + * Tue Sep 01 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc3.20200901gitb51594df17d0.1] - b51594df17d0 rebase - Fedora filter update ("Justin M. Forbes") |