diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-24 08:56:13 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-24 09:05:36 +0100 |
| commit | 4cdd86ecb8a474fde41352744392c14bd686a4ad (patch) | |
| tree | 579fe146a29e796eb1a3ed96ae81682729e6dba7 | |
| parent | 67e4e538f3a262d6656a5f4298575c4dfb5c7e5e (diff) | |
| download | kernel-4cdd86ecb8a474fde41352744392c14bd686a4ad.tar.gz kernel-4cdd86ecb8a474fde41352744392c14bd686a4ad.tar.xz kernel-4cdd86ecb8a474fde41352744392c14bd686a4ad.zip | |
fix a file conflictkernel-5.6.0-0.rc3.git0.1.vanilla.knurd.2.fc33kernel-5.6.0-0.rc3.git0.1.vanilla.knurd.2.fc32kernel-5.6.0-0.rc3.git0.1.vanilla.knurd.2.fc31kernel-5.6.0-0.rc3.git0.1.vanilla.knurd.2.fc30
| -rw-r--r-- | kernel.spec | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 69de5ddf8..f0cd9e14c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -58,7 +58,7 @@ Summary: The Linux kernel # define buildid .local %define packager Thorsten Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories -%define buildid .vanilla.knurd.1 +%define buildid .vanilla.knurd.2 %if 0%{?fedora} %define primary_target fedora @@ -1553,7 +1553,7 @@ git am %{patches} chmod +x scripts/checkpatch.pl chmod +x tools/objtool/sync-check.sh -mv COPYING COPYING-%{version} +mv COPYING COPYING-%{version}-rc3 # This Prevents scripts/setlocalversion from mucking with our version numbers. touch .scmversion @@ -2848,7 +2848,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}-rc3\ /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 \ |