diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-22 21:46:16 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-22 21:46:16 +0200 |
commit | 88cd7f3c81e0773ec035a3bd163b5f213173bc88 (patch) | |
tree | 1b7f041991e1b6fe7b940382dc730a40ab342ebb /kernel.spec | |
parent | 7cb22491eca6b57d56d92ba3ff7e7a4ae4e19304 (diff) | |
parent | 5b40d3126128231e6a0d0fe99e5a8e0daff636bc (diff) | |
download | kernel-88cd7f3c81e0773ec035a3bd163b5f213173bc88.tar.gz kernel-88cd7f3c81e0773ec035a3bd163b5f213173bc88.tar.xz kernel-88cd7f3c81e0773ec035a3bd163b5f213173bc88.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index ddfe18e7a..9140dee92 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.rc6.20200720git5714ee50bb43.1 +%global distro_build 0.rc6.20200721git4fa640dc5230.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.rc6.20200720git5714ee50bb43.1 +%define pkgrelease 0.rc6.20200721git4fa640dc5230.1 # This is needed to do merge window version magic %define patchlevel 8 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20200720git5714ee50bb43.1%{?buildid}%{?dist} +%define specrelease 0.rc6.20200721git4fa640dc5230.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-20200720git5714ee50bb43.tar.xz +Source0: linux-20200721git4fa640dc5230.tar.xz Source1: Makefile.rhelver @@ -1310,8 +1310,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200720git5714ee50bb43 -c -mv linux-20200720git5714ee50bb43 linux-%{KVERREL} +%setup -q -n kernel-20200721git4fa640dc5230 -c +mv linux-20200721git4fa640dc5230 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2848,6 +2848,11 @@ fi # # %changelog +* Tue Jul 21 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc6.20200721git4fa640dc5230.1] +- 4fa640dc5230 rebase +- Updated changelog for the release based on 5714ee50bb43 (Fedora Kernel Team) +- redhat/docs: Add Fedora RPM tagging date (Prarit Bhargava) + * Mon Jul 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc6.20200720git5714ee50bb43.1] - 5714ee50bb43 rebase - Updated changelog for the release based on f932d58abc38 (Fedora Kernel Team) |