Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc5.39.vanilla.1.fc34

1 files changed, 9 insertions, 6 deletions

diff --git a/kernel.spec b/kernel.spec
index f1b58bb90..0cd742c87 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,7 +85,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 
-%global distro_build 0.rc4.20211008git1da38549dd64.36
+%global distro_build 0.rc5.39
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
 
 %define rpmversion 5.15.0
 %define patchversion 5.15
-%define pkgrelease 0.rc4.20211008git1da38549dd64.36
+%define pkgrelease 0.rc5.39
 
 # This is needed to do merge window version magic
 %define patchlevel 15
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.20211008git1da38549dd64.36%{?buildid}%{?dist}
+%define specrelease 0.rc5.39%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -679,7 +679,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.15-rc4-193-g1da38549dd64.tar.xz
+Source0: linux-5.15-rc5.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1370,8 +1370,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.15-rc4-193-g1da38549dd64 -c
-mv linux-5.15-rc4-193-g1da38549dd64 linux-%{KVERREL}
+%setup -q -n kernel-5.15-rc5 -c
+mv linux-5.15-rc5 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -2974,6 +2974,9 @@ fi
 #
 #
 %changelog
+* Sat Oct 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc4.20211009git5d6ab0bb408f.37]
+- redhat: fix typo and make the output more silent for dist-git sync (Herton R. Krzesinski)
+
 * Thu Oct 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc4.20211007git5af4055fa813.35]
 - Fedora NTFS config updates (Justin M. Forbes)
 - Fedora 5.15 configs part 1 (Justin M. Forbes)