diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-09 20:06:34 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-09 20:06:34 +0200 |
commit | 74d01250fa4f11788cf5b4569d67c3f5af4b9f50 (patch) | |
tree | add98271443f76e1d6e94a50052c0003a074fc1b /kernel.spec | |
parent | b6324304fedf1e291d2e4c94db51c36e9e2abf6b (diff) | |
parent | 1e802729aad6c95148f8b582528eae7ba1cb263d (diff) | |
download | kernel-74d01250fa4f11788cf5b4569d67c3f5af4b9f50.tar.gz kernel-74d01250fa4f11788cf5b4569d67c3f5af4b9f50.tar.xz kernel-74d01250fa4f11788cf5b4569d67c3f5af4b9f50.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc4.20200709git0bddd227f3dc.1.vanilla.1.fc33kernel-5.8.0-0.rc4.20200709git0bddd227f3dc.1.vanilla.1.fc32kernel-5.8.0-0.rc4.20200709git0bddd227f3dc.1.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 3cf9ece7d..8c62892da 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.20200708gitdcde237b9b0e.1 +%global distro_build 0.rc4.20200709git0bddd227f3dc.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.20200708gitdcde237b9b0e.1 +%define pkgrelease 0.rc4.20200709git0bddd227f3dc.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.20200708gitdcde237b9b0e.1%{?buildid}%{?dist} +%define specrelease 0.rc4.20200709git0bddd227f3dc.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-20200708gitdcde237b9b0e.tar.xz +Source0: linux-20200709git0bddd227f3dc.tar.xz Source1: Makefile.rhelver @@ -1282,8 +1282,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200708gitdcde237b9b0e -c -mv linux-20200708gitdcde237b9b0e linux-%{KVERREL} +%setup -q -n kernel-20200709git0bddd227f3dc -c +mv linux-20200709git0bddd227f3dc linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2794,8 +2794,8 @@ fi # # %changelog -* Wed Jul 08 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.20200708gitdcde237b9b0e.1] -- dcde237b9b0e rebase +* Thu Jul 09 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.20200709git0bddd227f3dc.1] +- 0bddd227f3dc 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] |