diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-06 17:45:02 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-06 17:45:02 +0200 |
| commit | f74174ce806f67006fc43d0822e891966702d82c (patch) | |
| tree | f9a84a9572ea072114db111d94f27689672076e8 /kernel.spec | |
| parent | 40b690d3b5b8bb7bb32ad27cd325c0cbb60d5352 (diff) | |
| parent | 358c00f77ff317634027eb4ac228be1df3632c44 (diff) | |
| download | kernel-f74174ce806f67006fc43d0822e891966702d82c.tar.gz kernel-f74174ce806f67006fc43d0822e891966702d82c.tar.xz kernel-f74174ce806f67006fc43d0822e891966702d82c.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc4.1.vanilla.1.fc33kernel-5.8.0-0.rc4.1.vanilla.1.fc32kernel-5.8.0-0.rc4.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 8be79337b..5b66ee9cd 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.20200701git7c30b859a947.1 +%global distro_build 0.rc4.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.rc3.20200701git7c30b859a947.1 +%define pkgrelease 0.rc4.1 # This is needed to do merge window version magic %define patchlevel 8 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20200701git7c30b859a947.1%{?buildid}%{?dist} +%define specrelease 0.rc4.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-20200701git7c30b859a947.tar.xz +Source0: linux-5.8-rc4.tar.xz Source1: Makefile.rhelver @@ -1282,8 +1282,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200701git7c30b859a947 -c -mv linux-20200701git7c30b859a947 linux-%{KVERREL} +%setup -q -n kernel-5.8-rc4 -c +mv linux-5.8-rc4 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2794,8 +2794,12 @@ fi # # %changelog -* Tue Jun 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc3.20200630git7c30b859a947.1] -- 7c30b859a947 rebase +* Mon Jul 06 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.1] +- v5.8-rc4 rebase +- Updated changelog for the release based on cd77006e01b3 (Fedora Kernel Team) + +* Thu Jul 02 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc3.20200702gitcd77006e01b3.1] +- cd77006e01b3 rebase - Updated changelog for the release based on v5.8-rc3 (Fedora Kernel Team) * Mon Jun 29 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc3.1] |