diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-01 19:13:58 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-01 19:13:58 +0200 |
| commit | d9a167afba12983d586637ae44f8ea2f5682a92c (patch) | |
| tree | 7d0b75d5c2f31b7cf808abf145477f0cbf39b8a0 /kernel.spec | |
| parent | 7a03aee8f21e3285c759529b3d91b965509cac2f (diff) | |
| parent | d254a0758539b4d01ea06dee5d2c03502596837c (diff) | |
| download | kernel-d9a167afba12983d586637ae44f8ea2f5682a92c.tar.gz kernel-d9a167afba12983d586637ae44f8ea2f5682a92c.tar.xz kernel-d9a167afba12983d586637ae44f8ea2f5682a92c.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc3.20200501gitc45e8bccecaf.1.vanilla.1.fc33kernel-5.7.0-0.rc3.20200501gitc45e8bccecaf.1.vanilla.1.fc32kernel-5.7.0-0.rc3.20200501gitc45e8bccecaf.1.vanilla.1.fc31kernel-5.7.0-0.rc3.20200501gitc45e8bccecaf.1.vanilla.1.fc30
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 aef98d896..b9af7fd3b 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.20200429git1d2cc5ac6f66.1 +%global distro_build 0.rc3.20200501gitc45e8bccecaf.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,10 +71,10 @@ Summary: The Linux kernel %endif %define rpmversion 5.7.0 -%define pkgrelease 0.rc3.20200429git1d2cc5ac6f66.1 +%define pkgrelease 0.rc3.20200501gitc45e8bccecaf.1 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20200429git1d2cc5ac6f66.1%{?buildid}%{?dist} +%define specrelease 0.rc3.20200501gitc45e8bccecaf.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -570,7 +570,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200429git1d2cc5ac6f66.tar.xz +Source0: linux-20200501gitc45e8bccecaf.tar.xz Source1: Makefile.rhelver @@ -1278,8 +1278,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200429git1d2cc5ac6f66 -c -mv linux-20200429git1d2cc5ac6f66 linux-%{KVERREL} +%setup -q -n kernel-20200501gitc45e8bccecaf -c +mv linux-20200501gitc45e8bccecaf linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2767,6 +2767,10 @@ fi # # %changelog +* Fri May 01 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc3.20200501gitc45e8bccecaf.1] +- c45e8bccecaf rebase +- Updated changelog for the release based on 1d2cc5ac6f66 ("CKI@GitLab") + * Wed Apr 29 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc3.20200429git1d2cc5ac6f66.1] - 1d2cc5ac6f66 rebase - Add cec to the filter overrides ("Justin M. Forbes") |