diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-18 07:48:04 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-18 07:48:04 +0200 |
| commit | ed5ac450dddfa528eeceeeb1f649c4b8b2146c03 (patch) | |
| tree | b2d8e814a6fdd122a2a3f2f09f4be89597bdf9e9 /kernel.spec | |
| parent | db34b1ee6200da1ca690006a24375fe6a1fcbed7 (diff) | |
| parent | 2a4f1d912c3ba4c8b15fb0873cc9161832d52831 (diff) | |
| download | kernel-ed5ac450dddfa528eeceeeb1f649c4b8b2146c03.tar.gz kernel-ed5ac450dddfa528eeceeeb1f649c4b8b2146c03.tar.xz kernel-ed5ac450dddfa528eeceeeb1f649c4b8b2146c03.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc1.20200617git69119673bd50.1.vanilla.1.fc33kernel-5.8.0-0.rc1.20200617git69119673bd50.1.vanilla.1.fc32kernel-5.8.0-0.rc1.20200617git69119673bd50.1.vanilla.1.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 c91520a9a..14165c075 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.20200616gita5dc8300df75.1 +%global distro_build 0.rc1.20200617git69119673bd50.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,13 +71,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.8.0 -%define pkgrelease 0.rc1.20200616gita5dc8300df75.1 +%define pkgrelease 0.rc1.20200617git69119673bd50.1 # This is needed to do merge window version magic %define patchlevel 8 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20200616gita5dc8300df75.1%{?buildid}%{?dist} +%define specrelease 0.rc1.20200617git69119673bd50.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-20200616gita5dc8300df75.tar.xz +Source0: linux-20200617git69119673bd50.tar.xz Source1: Makefile.rhelver @@ -1281,8 +1281,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200616gita5dc8300df75 -c -mv linux-20200616gita5dc8300df75 linux-%{KVERREL} +%setup -q -n kernel-20200617git69119673bd50 -c +mv linux-20200617git69119673bd50 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2787,6 +2787,10 @@ fi # # %changelog +* Wed Jun 17 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc1.20200617git69119673bd50.1] +- 69119673bd50 rebase +- Updated changelog for the release based on a5dc8300df75 (Fedora Kernel Team) + * Tue Jun 16 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc1.20200616gita5dc8300df75.1] - a5dc8300df75 rebase - Fedora config update for rc1 ("Justin M. Forbes") |