diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-11 18:33:32 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-11 18:33:32 +0200 |
commit | bac22f74b65e52f4edea9b22087b6206d4a03500 (patch) | |
tree | 53b1c3bba759bcb78a083ab10fa9aedb63f0eeaf /kernel.spec | |
parent | 8f7d01ac1141925e0745baebc8d8b2e843a7938b (diff) | |
parent | 9f12cede493a51fa8d6915a0b8667f157e4a591b (diff) | |
download | kernel-bac22f74b65e52f4edea9b22087b6206d4a03500.tar.gz kernel-bac22f74b65e52f4edea9b22087b6206d4a03500.tar.xz kernel-bac22f74b65e52f4edea9b22087b6206d4a03500.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc0.git7.1.vanilla.knurd.1.fc29kernel-4.17.0-0.rc0.git7.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc0.git7.1.vanilla.knurd.1.fc27kernel-4.17.0-0.rc0.git7.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec index 6f40f6a2c..108347658 100644 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 0 # The git snapshot level -%define gitrev 6 +%define gitrev 7 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1094,6 +1094,7 @@ git am %{patches} chmod +x scripts/checkpatch.pl chmod +x tools/objtool/sync-check.sh +mv COPYING COPYING-%{version} # This Prevents scripts/setlocalversion from mucking with our version numbers. touch .scmversion @@ -1823,7 +1824,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\ +%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 \ @@ -1875,6 +1876,9 @@ fi # # %changelog +* Wed Apr 11 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git7.1 +- Linux v4.16-11490-gb284d4d5a678 + * Tue Apr 10 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc0.git6.1 - Linux v4.16-10929-gc18bb396d3d2 |