diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-24 18:25:45 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-24 18:25:45 +0100 |
| commit | c4f7a15d6480e450ed19f3aa94dc3a12b69f06c4 (patch) | |
| tree | ff3f3f7916c38cb30365e24125f022988db225e1 | |
| parent | 4cdd86ecb8a474fde41352744392c14bd686a4ad (diff) | |
| download | kernel-c4f7a15d6480e450ed19f3aa94dc3a12b69f06c4.tar.gz kernel-c4f7a15d6480e450ed19f3aa94dc3a12b69f06c4.tar.xz kernel-c4f7a15d6480e450ed19f3aa94dc3a12b69f06c4.zip | |
Revert "fix a file conflict"
This reverts commit 4cdd86ecb8a474fde41352744392c14bd686a4ad.
| -rw-r--r-- | kernel.spec | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index f0cd9e14c..69de5ddf8 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.2 +%define buildid .vanilla.knurd.1 %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}-rc3 +mv COPYING COPYING-%{version} # 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}-rc3\ +%license linux-%{KVERREL}/COPYING-%{version}\ /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 \ |