diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-11 06:08:21 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-11 06:08:21 +0200 |
| commit | e35e769d8cb3726d2e5a009d4223037ba45a5157 (patch) | |
| tree | 36a0264da942601ba6c15491620ac4cde2c4ea44 /kernel.spec | |
| parent | 74d01250fa4f11788cf5b4569d67c3f5af4b9f50 (diff) | |
| parent | d8d578bfa82493a49b71c8665b2f48c3e6df3617 (diff) | |
| download | kernel-e35e769d8cb3726d2e5a009d4223037ba45a5157.tar.gz kernel-e35e769d8cb3726d2e5a009d4223037ba45a5157.tar.xz kernel-e35e769d8cb3726d2e5a009d4223037ba45a5157.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc4.20200710git42f82040ee66.1.vanilla.1.fc32kernel-5.8.0-0.rc4.20200710git42f82040ee66.1.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 8c62892da..353cb6d3f 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.20200709git0bddd227f3dc.1 +%global distro_build 0.rc4.20200710git42f82040ee66.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.rc4.20200709git0bddd227f3dc.1 +%define pkgrelease 0.rc4.20200710git42f82040ee66.1 # This is needed to do merge window version magic %define patchlevel 8 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20200709git0bddd227f3dc.1%{?buildid}%{?dist} +%define specrelease 0.rc4.20200710git42f82040ee66.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-20200709git0bddd227f3dc.tar.xz +Source0: linux-20200710git42f82040ee66.tar.xz Source1: Makefile.rhelver @@ -1282,8 +1282,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200709git0bddd227f3dc -c -mv linux-20200709git0bddd227f3dc linux-%{KVERREL} +%setup -q -n kernel-20200710git42f82040ee66 -c +mv linux-20200710git42f82040ee66 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2794,8 +2794,12 @@ fi # # %changelog -* Thu Jul 09 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.20200709git0bddd227f3dc.1] -- 0bddd227f3dc rebase +* Fri Jul 10 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.20200710git42f82040ee66.1] +- 42f82040ee66 rebase +- Updated changelog for the release based on dcde237b9b0e (Fedora Kernel Team) + +* Wed Jul 08 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.20200708gitdcde237b9b0e.1] +- dcde237b9b0e rebase - Updated changelog for the release based on v5.8-rc4 (Fedora Kernel Team) * Mon Jul 06 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.1] |