From 27e0f946b34d48a622c5c6fd9bec8684a6306cec6029b2c20fb5eba78dae58b7 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 15 Feb 2018 11:45:31 +0000
Subject: [PATCH] Accepting request 576938 from
 home:coolo:branches:openSUSE:Factory

- Allow some deprecated licenses that we would replace on commit
  (SPDX 2->SPDX 3 conversion)

OBS-URL: https://build.opensuse.org/request/show/576938
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory:rpmlint/rpmlint?expand=0&rev=566
---
 rpmlint.changes | 6 ++++++
 rpmlint.spec    | 4 ++++
 2 files changed, 10 insertions(+)

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