diff --git a/rpmlint.changes b/rpmlint.changes index caca163..659c40a 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 15 09:35:51 UTC 2018 - coolo@suse.com + +- Allow some deprecated licenses that we would replace on commit + (SPDX 2->SPDX 3 conversion) + ------------------------------------------------------------------- Thu Feb 08 13:52:13 UTC 2018 - opensuse-packaging@opensuse.org diff --git a/rpmlint.spec b/rpmlint.spec index f585fb6..859b9a2 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -142,6 +142,10 @@ cp %{SOURCE12} licenses.config cut '-d ' -f1 %{_prefix}/lib/obs/service/format_spec_file.files/licenses_changes.txt | tail -n +2 | sort -u | while read l; do sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config done +# add some deprecated licenses we allow for now +for l in AGPL-3.0 GFDL-1.1 GFDL-1.2 GFDL-1.3 GPL-1.0+ GPL-1.0 GPL-2.0+ GPL-2.0 GPL-3.0+ GPL-3.0 LGPL-2.0 LGPL-2.0+ LGPL-2.1+ LGPL-2.1 LGPL-3.0+ LGPL-3.0; do + sed -i -e "s/\(#VALIDLICENSES\)/\1\n '$l',/" licenses.config +done install -m 644 licenses.config %{buildroot}/%{_sysconfdir}/rpmlint/ %check