From 041b387bfe8621326c37694c3cdf1c2155dc5f5d Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Mon, 24 Feb 2020 10:35:49 -0500 Subject: [PATCH] Include the release in the kernel COPYING file Whenever upstream changes the COPYING file it leads to an RPM file conflict because the name is set to, for example, 5.6.0 for the whole release cycle, but multiple kernel packages need to be installed that reference that same file. This rarely happens, but it's annoying and the file is tiny so just have one per installed kernel. Signed-off-by: Jeremy Cline --- kernel.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel.spec b/kernel.spec index 97f4d051d..d17fe2d37 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1533,7 +1533,7 @@ git am %{patches} chmod +x scripts/checkpatch.pl chmod +x tools/objtool/sync-check.sh -mv COPYING COPYING-%{version} +mv COPYING COPYING-%{version}-%{release} # This Prevents scripts/setlocalversion from mucking with our version numbers. touch .scmversion @@ -2828,7 +2828,7 @@ fi %if %{2}\ %{expand:%%files -f kernel-%{?3:%{3}-}core.list %{?1:-f kernel-%{?3:%{3}-}ldsoconf.list} %{?3:%{3}-}core}\ %{!?_licensedir:%global license %%doc}\ -%license linux-%{KVERREL}/COPYING-%{version}\ +%license linux-%{KVERREL}/COPYING-%{version}-%{release}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}\ %ghost /%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?3:+%{3}}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/.vmlinuz.hmac \