diff options
| author | Jeremy Cline <jcline@redhat.com> | 2020-02-24 10:35:49 -0500 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2020-02-24 10:40:51 -0500 |
| commit | 041b387bfe8621326c37694c3cdf1c2155dc5f5d (patch) | |
| tree | 9c377dea7bc29b32596961188a84f4f707fb99c9 | |
| parent | 4f1980456ed199c0ea6aaea5ff907f98471df4d6 (diff) | |
| download | kernel-041b387bfe8621326c37694c3cdf1c2155dc5f5d.tar.gz kernel-041b387bfe8621326c37694c3cdf1c2155dc5f5d.tar.xz kernel-041b387bfe8621326c37694c3cdf1c2155dc5f5d.zip | |
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 <jcline@redhat.com>
| -rw-r--r-- | kernel.spec | 4 |
1 files 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 \ |