diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-15 20:09:46 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-11-15 20:09:46 +0100 |
commit | 82b13176858df75c68fbf91fe8c953d5775aef7c (patch) | |
tree | 1c8e7205d92b28e100521a6f22a5e6220d58009b /kernel.spec | |
parent | a09ec90e080ac733543ab8f2161e7cb922a1d98f (diff) | |
parent | 382121b4a1014bed9440edad2e83f5f080b05425 (diff) | |
download | kernel-82b13176858df75c68fbf91fe8c953d5775aef7c.tar.gz kernel-82b13176858df75c68fbf91fe8c953d5775aef7c.tar.xz kernel-82b13176858df75c68fbf91fe8c953d5775aef7c.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.4.0-0.rc7.git2.1.vanilla.knurd.1.fc32kernel-5.4.0-0.rc7.git2.1.vanilla.knurd.1.fc31kernel-5.4.0-0.rc7.git2.1.vanilla.knurd.1.fc30kernel-5.4.0-0.rc7.git2.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index fa4e1a1f5..e7acf6b91 100644 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -112,7 +112,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 7 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 5.%{upstream_sublevel}.0 %endif @@ -2532,6 +2532,9 @@ fi # # %changelog +* Fri Nov 15 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc7.git2.1 +- Linux v5.4-rc7-68-g96b95eff4a59 + * Thu Nov 14 2019 Laura Abbott <labbott@redhat.com> - 5.4.0-0.rc7.git1.2 - bump and build |