diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-11 16:57:56 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-11 16:57:56 +0200 |
| commit | 7c560cced273f00fd01f151cdcbfed021d16ef00 (patch) | |
| tree | 2ebcd4001c7b18f883dda4f219dcc476bbc440d5 /kernel.spec | |
| parent | cc7181fc13a9960b07cfd2d4d96b6da20b6be3bc (diff) | |
| parent | ce2585656b05537b545b5d5ad88a1b9719d24777 (diff) | |
| download | kernel-7c560cced273f00fd01f151cdcbfed021d16ef00.tar.gz kernel-7c560cced273f00fd01f151cdcbfed021d16ef00.tar.xz kernel-7c560cced273f00fd01f151cdcbfed021d16ef00.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc5.1.vanilla.1.fc33kernel-5.7.0-0.rc5.1.vanilla.1.fc32kernel-5.7.0-0.rc5.1.vanilla.1.fc31kernel-5.7.0-0.rc5.1.vanilla.1.fc30
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 4e0a1fc45..11924b816 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.rc4.20200508git79dede78c057.1 +%global distro_build 0.rc5.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.rc4.20200508git79dede78c057.1 +%define pkgrelease 0.rc5.1 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20200508git79dede78c057.1%{?buildid}%{?dist} +%define specrelease 0.rc5.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -566,7 +566,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200508git79dede78c057.tar.xz +Source0: linux-5.7-rc5.tar.xz Source1: Makefile.rhelver @@ -1275,8 +1275,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200508git79dede78c057 -c -mv linux-20200508git79dede78c057 linux-%{KVERREL} +%setup -q -n kernel-5.7-rc5 -c +mv linux-5.7-rc5 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2765,6 +2765,20 @@ fi # # %changelog +* Mon May 11 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc5.1] +- v5.7-rc5 rebase +- Updated changelog for the release based on e99332e7b4cd ("CKI@GitLab") + +* Sun May 10 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc4.20200510gite99332e7b4cd.1] +- e99332e7b4cd rebase +- Updated changelog for the release based on d5eeab8d7e26 ("CKI@GitLab") + +* Sat May 09 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc4.20200509gitd5eeab8d7e26.1] +- d5eeab8d7e26 rebase +- Add zero-commit to format-patch options ("Justin M. Forbes") +- Updated changelog for the release based on 79dede78c057 ("CKI@GitLab") +- Introduce a Sphinx documentation project (Jeremy Cline) + * Fri May 08 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc4.20200508git79dede78c057.1] - 79dede78c057 rebase - Updated changelog for the release based on a811c1fa0a02 ("CKI@GitLab") |