From 66ddf7034173bbd1fb2a19a15c7bdbad646d7e6cd402f612d43670adfce9a520 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 20 Feb 2018 13:11:54 +0000 Subject: [PATCH] Accepting request 578342 from home:dimstar:Factory - Add one more deprecated license: + GPL-2.0-with-font-exception. Hopefully the last one to unbreak rings 1 + 2 OBS-URL: https://build.opensuse.org/request/show/578342 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=572 --- rpmlint.changes | 6 ++++++ rpmlint.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rpmlint.changes b/rpmlint.changes index 89095f7..2d9d192 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 20 12:52:18 UTC 2018 - dimstar@opensuse.org + +- Add one more deprecated license: + + GPL-2.0-with-font-exception. + ------------------------------------------------------------------- Tue Feb 20 05:37:21 UTC 2018 - coolo@suse.com diff --git a/rpmlint.spec b/rpmlint.spec index 76e93bb..adfa1fd 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -145,7 +145,7 @@ cut '-d ' -f1 %{_prefix}/lib/obs/service/format_spec_file.files/licenses_changes done # add some deprecated licenses we allow for now for l in AGPL-3.0 AGPL-3.0+ GFDL-1.1 GFDL-1.1+ GFDL-1.2 GFDL-1.2+ GFDL-1.3 GFDL-1.3+ GPL-3.0-with-GCC-exception \ - GPL-2.0-with-classpath-exception SUSE-LGPL-2.1+-with-GCC-exception SUSE-NonFree \ + GPL-2.0-with-classpath-exception GPL-2.0-with-font-exception SUSE-LGPL-2.1+-with-GCC-exception SUSE-NonFree \ 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