From 9c9c887523ce26e0ab01953188fc1d1839dac65d310b6947690de0a71e888ec5 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sat, 6 Oct 2012 13:08:37 +0000
Subject: [PATCH] - allow a + variant for all spdx licenses

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=97
---
 fetch-licenses.sh                    |   5 +-
 licenses_changes.txt                 | 163 +++++++++++++++++++++++++++
 obs-service-format_spec_file.changes |   5 +
 3 files changed, 172 insertions(+), 1 deletion(-)

diff --git a/fetch-licenses.sh b/fetch-licenses.sh
index bb96875..e850cd3 100644
--- a/fetch-licenses.sh
+++ b/fetch-licenses.sh
@@ -1,5 +1,8 @@
 curl "https://docs.google.com/spreadsheet/pub?hl=en_US&hl=en_US&key=0AqPp4y2wyQsbdGQ1V3pRRDg5NEpGVWpubzdRZ0tjUWc&single=true&gid=0&output=txt" | grep -v "New format" > licenses_changes.txt
-for i in `w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text" | sed -e 's, *Y *License Text,,; s, *License Text,,; s,.* ,,;'`; do echo "$i	$i" >> licenses_changes.txt ; done
+for i in `w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text" | sed -e 's, *Y *License Text,,; s, *License Text,,; s,.* ,,;'`; do 
+	echo "$i	$i" >> licenses_changes.txt ; 
+	echo "$i+	$i+" >> licenses_changes.txt ;
+done
 sort -o licenses_changes.txt -u licenses_changes.txt
 ( echo "First line" ; cat licenses_changes.txt ) > t
 mv t licenses_changes.txt
diff --git a/licenses_changes.txt b/licenses_changes.txt
index a818ae6..daea58d 100644
--- a/licenses_changes.txt
+++ b/licenses_changes.txt
@@ -1,20 +1,31 @@
 First line
+AAL+	AAL+
 AAL	AAL
+AFL-1.1+	AFL-1.1+
 AFL-1.1	AFL-1.1
+AFL-1.2+	AFL-1.2+
 AFL-1.2	AFL-1.2
+AFL-2.0+	AFL-2.0+
 AFL-2.0	AFL-2.0
 AFL-2.1	Academic Free License 2.1
+AFL-2.1+	AFL-2.1+
 AFL-2.1	AFL 2.1
 AFL-2.1	AFL-2.1
+AFL-3.0+	AFL-3.0+
 AFL-3.0	AFL-3.0
 AGPL-3.0	Affero GPL
+AGPL-3.0+	AGPL-3.0+
 AGPL-3.0	AGPL-3.0
 AGPL-3.0	AGPLv3
+ANTLR-PD+	ANTLR-PD+
 ANTLR-PD	ANTLR-PD
+Apache-1.0+	Apache-1.0+
 Apache-1.0	Apache-1.0
+Apache-1.1+	Apache-1.1+
 Apache-1.1	Apache-1.1
 Apache-1.1	Apache 1.1 (Indiana University)
 Apache-1.1	ASL 1.1
+Apache-2.0+	Apache-2.0+
 Apache-2.0	Apache 2.0
 Apache-2.0	Apache-2.0
 Apache-2.0	Apache License
@@ -30,33 +41,44 @@ Apache-2.0	ASLv..
 Apache-2.0	ASLv2
 Apache-2.0	ASLv2.0
 Apache-2.0	The Apache Software License
+APL-1.0+	APL-1.0+
 APL-1.0	APL-1.0
 APL-1.0	APL-1.0 (spdx.org/licenses)
+APSL-1.0+	APSL-1.0+
 APSL-1.0	APSL-1.0
+APSL-1.1+	APSL-1.1+
 APSL-1.1	APSL-1.1
+APSL-1.2+	APSL-1.2+
 APSL-1.2	APSL-1.2
+APSL-2.0+	APSL-2.0+
 APSL-2.0	APSL-2.0
 Artistic-1.0	Artistic
+Artistic-1.0+	Artistic-1.0+
 Artistic-1.0	Artistic 1.0
 Artistic-1.0	Artistic-1.0
 Artistic-1.0	Artistic license
 Artistic-1.0	Artistic License
 Artistic-1.0	Artistic License ..
 Artistic-1.0 or GPL-1.0+	Perl License
+Artistic-2.0+	Artistic-2.0+
 Artistic-2.0	Artistic 2.0
 Artistic-2.0	Artistic-2.0
 BSD-2-Clause	BSD2c
 BSD-2-Clause	BSD-2c
 BSD-2-Clause	BSD 2 clause
 BSD-2-Clause	BSD 2-clause
+BSD-2-Clause+	BSD-2-Clause+
 BSD-2-Clause	BSD 2 Clause
 BSD-2-Clause	BSD 2-Clause
 BSD-2-Clause	BSD-2-Clause
+BSD-2-Clause-FreeBSD+	BSD-2-Clause-FreeBSD+
 BSD-2-Clause-FreeBSD	BSD-2-Clause-FreeBSD
+BSD-2-Clause-NetBSD+	BSD-2-Clause-NetBSD+
 BSD-2-Clause-NetBSD	BSD-2-Clause-NetBSD
 BSD-3-Clause	BSD3
 BSD-3-Clause	BSD-3
 BSD-3-Clause	BSD3c
+BSD-3-Clause+	BSD-3-Clause+
 BSD-3-Clause	BSD 3-Clause
 BSD-3-Clause	BSD (3-Clause)
 BSD-3-Clause	BSD-3-Clause
@@ -66,98 +88,157 @@ BSD-3-Clause	BSD3c (or similar)
 BSD-3-Clause	BSD3c(or similar)
 BSD-3-Clause	New BSD License
 BSD-4-Clause	BSD4c
+BSD-4-Clause+	BSD-4-Clause+
 BSD-4-Clause	BSD-4-Clause
 BSD-4-Clause	BSD4c(or similar)
+BSD-4-Clause-UC+	BSD-4-Clause-UC+
 BSD-4-Clause-UC	BSD-4-Clause-UC
+BSL-1.0+	BSL-1.0+
 BSL-1.0	BSL-1.0
+CATOSL-1.1+	CATOSL-1.1+
 CATOSL-1.1	CATOSL-1.1
+CC0-1.0+	CC0-1.0+
 CC0-1.0	CC0-1.0
+CC-BY-1.0+	CC-BY-1.0+
 CC-BY-1.0	CC-BY-1.0
+CC-BY-2.0+	CC-BY-2.0+
 CC-BY-2.0	CC-BY-2.0
+CC-BY-2.5+	CC-BY-2.5+
 CC-BY-2.5	CC-BY-2.5
+CC-BY-3.0+	CC-BY-3.0+
 CC-BY-3.0	CC-BY-3.0
+CC-BY-NC-1.0+	CC-BY-NC-1.0+
 CC-BY-NC-1.0	CC-BY-NC-1.0
+CC-BY-NC-2.0+	CC-BY-NC-2.0+
 CC-BY-NC-2.0	CC-BY-NC-2.0
+CC-BY-NC-2.5+	CC-BY-NC-2.5+
 CC-BY-NC-2.5	CC-BY-NC-2.5
+CC-BY-NC-3.0+	CC-BY-NC-3.0+
 CC-BY-NC-3.0	CC-BY-NC-3.0
+CC-BY-NC-ND-1.0+	CC-BY-NC-ND-1.0+
 CC-BY-NC-ND-1.0	CC-BY-NC-ND-1.0
+CC-BY-NC-ND-2.0+	CC-BY-NC-ND-2.0+
 CC-BY-NC-ND-2.0	CC-BY-NC-ND-2.0
+CC-BY-NC-ND-2.5+	CC-BY-NC-ND-2.5+
 CC-BY-NC-ND-2.5	CC-BY-NC-ND-2.5
+CC-BY-NC-ND-3.0+	CC-BY-NC-ND-3.0+
 CC-BY-NC-ND-3.0	CC-BY-NC-ND-3.0
+CC-BY-NC-SA-1.0+	CC-BY-NC-SA-1.0+
 CC-BY-NC-SA-1.0	CC-BY-NC-SA-1.0
+CC-BY-NC-SA-2.0+	CC-BY-NC-SA-2.0+
 CC-BY-NC-SA-2.0	CC-BY-NC-SA-2.0
+CC-BY-NC-SA-2.5+	CC-BY-NC-SA-2.5+
 CC-BY-NC-SA-2.5	CC-BY-NC-SA-2.5
+CC-BY-NC-SA-3.0+	CC-BY-NC-SA-3.0+
 CC-BY-NC-SA-3.0	CC-BY-NC-SA-3.0
+CC-BY-ND-1.0+	CC-BY-ND-1.0+
 CC-BY-ND-1.0	CC-BY-ND-1.0
+CC-BY-ND-2.0+	CC-BY-ND-2.0+
 CC-BY-ND-2.0	CC-BY-ND-2.0
+CC-BY-ND-2.5+	CC-BY-ND-2.5+
 CC-BY-ND-2.5	CC-BY-ND-2.5
+CC-BY-ND-3.0+	CC-BY-ND-3.0+
 CC-BY-ND-3.0	CC-BY-ND-3.0
+CC-BY-SA-1.0+	CC-BY-SA-1.0+
 CC-BY-SA-1.0	CC-BY-SA-1.0
+CC-BY-SA-2.0+	CC-BY-SA-2.0+
 CC-BY-SA-2.0	CC-BY-SA-2.0
+CC-BY-SA-2.5+	CC-BY-SA-2.5+
 CC-BY-SA-2.5	CC-BY-SA-2.5
 CC-BY-SA-2.5	CC by-sa V2.5
+CC-BY-SA-3.0+	CC-BY-SA-3.0+
 CC-BY-SA-3.0	CC BY-SA 3.0
 CC-BY-SA-3.0	CC-BY-SA-3.0
 CC-BY-SA-3.0	CC BY-SA V3.0
 CDDL-1.0	CDDL
+CDDL-1.0+	CDDL-1.0+
 CDDL-1.0	CDDL 1.0
 CDDL-1.0	CDDL-1.0
+CDDL-1.1+	CDDL-1.1+
 CDDL-1.1	CDDL-1.1
+CECILL-1.0+	CECILL-1.0+
 CECILL-1.0	CECILL-1.0
+CECILL-1.1+	CECILL-1.1+
 CECILL-1.1	CECILL-1.1
 CECILL-1.1English	CECILL-1.1English
+CECILL-2.0+	CECILL-2.0+
 CECILL-2.0	CECILL-2.0
+CECILL-B+	CECILL-B+
 CECILL-B	CECILL-B
+CECILL-C+	CECILL-C+
 CECILL-C	CECILL-C
+ClArtistic+	ClArtistic+
 ClArtistic	ClArtistic
+CNRI-Python+	CNRI-Python+
 CNRI-Python	CNRI-Python
+CNRI-Python-GPL-Compatible+	CNRI-Python-GPL-Compatible+
 CNRI-Python-GPL-Compatible	CNRI-Python-GPL-Compatible
+CPAL-1.0+	CPAL-1.0+
 CPAL-1.0	CPAL-1.0
 CPL-1.0	Common Public License v1.0
 CPL-1.0	Common Public License - v 1.0
 CPL-1.0	Common Public License v1.0 (CPL)
 CPL-1.0	Common Public License Version 1.0
 CPL-1.0	Common Public License Version 1.0 (CPL1.0)
+CPL-1.0+	CPL-1.0+
 CPL-1.0	CPL 1.0
 CPL-1.0	CPL 1.0 ...
 CPL-1.0	CPL-1.0
 CPL-1.0	CPL (Common Public License) v1
+CUA-OPL-1.0+	CUA-OPL-1.0+
 CUA-OPL-1.0	CUA-OPL-1.0
+ECL-1.0+	ECL-1.0+
 ECL-1.0	ECL-1.0
+ECL-2.0+	ECL-2.0+
 ECL-2.0	ECL-2.0
+eCos-2.0+	eCos-2.0+
 eCos-2.0	eCos-2.0
+EFL-1.0+	EFL-1.0+
 EFL-1.0	EFL-1.0
+EFL-2.0+	EFL-2.0+
 EFL-2.0	EFL-2.0
+Entessa+	Entessa+
 Entessa	Entessa
 EPL-1.0	Eclipse-1.0
 EPL-1.0	Eclipse Public License
 EPL-1.0	Eclipse Public License 1.0
 EPL-1.0	EPL
 EPL-1.0	EPL-1
+EPL-1.0+	EPL-1.0+
 EPL-1.0	EPL 1.0
 EPL-1.0	EPL 1.0 ...
 EPL-1.0	EPL-1.0
 EPL-1.0	EPL v1.0
 ErlPL-1.1	Erlang Public License
+ErlPL-1.1+	ErlPL-1.1+
 ErlPL-1.1	ErlPL-1.1
+EUDatagrid+	EUDatagrid+
 EUDatagrid	EUDatagrid
+EUPL-1.0+	EUPL-1.0+
 EUPL-1.0	EUPL-1.0
+EUPL-1.1+	EUPL-1.1+
 EUPL-1.1	EUPL-1.1
+Fair+	Fair+
 Fair	Fair
+Frameworx-1.0+	Frameworx-1.0+
 Frameworx-1.0	Frameworx-1.0
+GFDL-1.1+	GFDL-1.1+
 GFDL-1.1	GFDL 1.1
 GFDL-1.1	GFDL-1.1
 GFDL-1.1	GFDLv1.1
 GFDL-1.1	GFDL v1.1
 GFDL-1.1	GNU Free Documentation License, Version 1.1 (GFDL 1.1)
+GFDL-1.2+	GFDL-1.2+
 GFDL-1.2	GFDL 1.2
 GFDL-1.2	GFDL-1.2
 GFDL-1.2	GFDLv1.2
 GFDL-1.2	GFDL v1.2
 GFDL-1.2	GNU Free Documentation License, Version 1.2 (GFDL 1.2)
+GFDL-1.3+	GFDL-1.3+
 GFDL-1.3	GFDL-1.3
 GFDL-1.3	GNU Free Documentation License, Version 1.3 (GFDL 1.3)
 GPL-1.0+	GPL+
+GPL-1.0++	GPL-1.0++
 GPL-1.0+	GPL-1.0+
 GPL-1.0	GPL-1.0
 GPL-1.0+	GPLv1+
@@ -172,6 +253,7 @@ GPL-2.0+	GPL2+
 GPL-2.0	GPL2
 GPL-2.0+	GPL-2+
 GPL-2.0	GPL-2
+GPL-2.0++	GPL-2.0++
 GPL-2.0+	GPL-2.0+
 GPL-2.0	GPL 2.0
 GPL-2.0	GPL-2.0
@@ -187,10 +269,15 @@ GPL-2.0+	GPLv2 or later
 GPL-2.0+	GPL v2 or later
 GPL-2.0+	GPL v2 or later  
 GPL-2.0+	libGeoIPUpdate is GPLv2 or later
+GPL-2.0-with-autoconf-exception+	GPL-2.0-with-autoconf-exception+
 GPL-2.0-with-autoconf-exception	GPL-2.0-with-autoconf-exception
+GPL-2.0-with-bison-exception+	GPL-2.0-with-bison-exception+
 GPL-2.0-with-bison-exception	GPL-2.0-with-bison-exception
+GPL-2.0-with-classpath-exception+	GPL-2.0-with-classpath-exception+
 GPL-2.0-with-classpath-exception	GPL-2.0-with-classpath-exception
+GPL-2.0-with-font-exception+	GPL-2.0-with-font-exception+
 GPL-2.0-with-font-exception	GPL-2.0-with-font-exception
+GPL-2.0-with-GCC-exception+	GPL-2.0-with-GCC-exception+
 GPL-2.0-with-GCC-exception	GPL-2.0-with-GCC-exception
 GPL-3.0	GNU General Public License version 3 (GPLv3)
 GPL-3.0+	GNU GPL v3 or later
@@ -199,6 +286,7 @@ GPL-3.0	GPL3
 GPL-3.0+	GPL-3+
 GPL-3.0	GPL 3
 GPL-3.0	GPL-3
+GPL-3.0++	GPL-3.0++
 GPL-3.0+	GPL-3.0+
 GPL-3.0	GPL-3.0
 GPL-3.0+	GPLv3+
@@ -206,18 +294,26 @@ GPL-3.0	GPLv3
 GPL-3.0	GPL v3
 GPL-3.0	GPL v3 only
 GPL-3.0+	GPL v3 or later
+GPL-3.0-with-autoconf-exception+	GPL-3.0-with-autoconf-exception+
 GPL-3.0-with-autoconf-exception	GPL-3.0-with-autoconf-exception
+GPL-3.0-with-GCC-exception+	GPL-3.0-with-GCC-exception+
 GPL-3.0-with-GCC-exception	GPL-3.0-with-GCC-exception
+gSOAP-1.3b+	gSOAP-1.3b+
 gSOAP-1.3b	gSOAP-1.3b
+HPND+	HPND+
 HPND	HPND
+IPA+	IPA+
 IPA	IPA
 IPA	see IPA_Font_License_Agreement_v1.0.txt
 IPL-1.0	IBM PL
 IPL-1.0	IBM Public License
 IPL-1.0	IBM Public License ..
+IPL-1.0+	IPL-1.0+
 IPL-1.0	IPL-1.0
+ISC+	ISC+
 ISC	ISC
 ISC	ISC License
+LGPL-2.0++	LGPL-2.0++
 LGPL-2.0+	LGPL-2.0+
 LGPL-2.0	LGPL-2.0
 LGPL-2.0	LGPLv2
@@ -232,6 +328,7 @@ LGPL-2.1	GNU LGPLv2.1
 LGPL-2.1+	GNU LGPL v2.1 or later
 LGPL-2.1+	LGPL-2.0.1 or later
 LGPL-2.1	LGPL2.1
+LGPL-2.1++	LGPL-2.1++
 LGPL-2.1+	LGPL-2.1+
 LGPL-2.1	LGPL 2.1
 LGPL-2.1	LGPL-2.1
@@ -246,23 +343,33 @@ LGPL-2.1	LGPL v2.1 only
 LGPL-2.1+	LGPL v2.1 or later
 LGPL-3.0	GNU Lesser General Public License (LGPL), Version 3
 LGPL-3.0	GNU Lesser General Public License version 3 (LGPL v3)
+LGPL-3.0++	LGPL-3.0++
 LGPL-3.0+	LGPL-3.0+
 LGPL-3.0	LGPL-3.0
 LGPL-3.0+	LGPLv3+
 LGPL-3.0	LGPLv3
 LGPL-3.0+	LGPL v3 or later
+Libpng+	Libpng+
 Libpng	Libpng
+LPL-1.02+	LPL-1.02+
 LPL-1.02	LPL-1.02
+LPL-1.0+	LPL-1.0+
 LPL-1.0	LPL-1.0
+LPPL-1.0+	LPPL-1.0+
 LPPL-1.0	LPPL-1.0
+LPPL-1.1+	LPPL-1.1+
 LPPL-1.1	LPPL-1.1
+LPPL-1.2+	LPPL-1.2+
 LPPL-1.2	LPPL-1.2
 LPPL-1.3c	LPPL ..
+LPPL-1.3c+	LPPL-1.3c+
 LPPL-1.3c	LPPL-1.3c
 LPPL-1.3c	TeX-License ..
+MirOS+	MirOS+
 MirOS	MirOS
 MIT	Expat
 MIT	Expat License
+MIT+	MIT+
 MIT	MIT
 MIT	MIT licence
 MIT	MIT-Licence
@@ -276,71 +383,113 @@ MIT	X11
 MIT	X11 (BSD like)
 MIT	X11 MIT
 MIT	X11/MIT
+Motosoto+	Motosoto+
 Motosoto	Motosoto
+MPL-1.0+	MPL-1.0+
 MPL-1.0	MPL-1.0
 MPL-1.0	MPLv1.0
 MPL-1.1	Mozilla Public License 1.1
 MPL-1.1	MOZILLA PUBLIC LICENSE (MPL/NPL)
+MPL-1.1+	MPL-1.1+
 MPL-1.1	MPL-1.1
 MPL-1.1	MPLv1.1
 MPL-1.1	MPLv1.1 ..
+MPL-2.0+	MPL-2.0+
 MPL-2.0	MPL-2.0
+MPL-2.0-no-copyleft-exception+	MPL-2.0-no-copyleft-exception+
 MPL-2.0-no-copyleft-exception	MPL-2.0-no-copyleft-exception
 MS-PL	Ms-Pl
+MS-PL+	MS-PL+
 MS-PL	MS-PL
+MS-RL+	MS-RL+
 MS-RL	MS-RL
+Multics+	Multics+
 Multics	Multics
+NASA-1.3+	NASA-1.3+
 NASA-1.3	NASA-1.3
+Naumen+	Naumen+
 Naumen	Naumen
+NCSA+	NCSA+
 NCSA	NCSA
+NGPL+	NGPL+
 NGPL	NGPL
+Nokia+	Nokia+
 Nokia	Nokia
+NPOSL-3.0+	NPOSL-3.0+
 NPOSL-3.0	NPOSL-3.0
+NTP+	NTP+
 NTP	NTP
+OCLC-2.0+	OCLC-2.0+
 OCLC-2.0	OCLC-2.0
+ODbL-1.0+	ODbL-1.0+
 ODbL-1.0	ODbL-1.0
+OFL-1.0+	OFL-1.0+
 OFL-1.0	OFL-1.0
 OFL-1.1	OFL
+OFL-1.1+	OFL-1.1+
 OFL-1.1	OFL-1.1
 OFL-1.1	Open Font License
 OFL-1.1	SIL Open Font License
 OFL-1.1	SIL Open Font License 1.1
+OGTSL+	OGTSL+
 OGTSL	OGTSL
+OLDAP-2.8+	OLDAP-2.8+
 OLDAP-2.8	OLDAP-2.8
 OLDAP-2.8	openldap 2.8
+OpenSSL+	OpenSSL+
 OpenSSL	OpenSSL
+OSL-1.0+	OSL-1.0+
 OSL-1.0	OSL-1.0
+OSL-2.0+	OSL-2.0+
 OSL-2.0	OSL-2.0
+OSL-2.1+	OSL-2.1+
 OSL-2.1	OSL-2.1
+OSL-3.0+	OSL-3.0+
 OSL-3.0	OSL-3.0
+PDDL-1.0+	PDDL-1.0+
 PDDL-1.0	PDDL-1.0
+PHP-3.01+	PHP-3.01+
 PHP-3.01	PHP-3.01
 PHP-3.01	PHP-3.0.1
 PHP-3.01	PHP License
 PHP-3.01	The PHP License, version 3.01
+PHP-3.0+	PHP-3.0+
 PHP-3.0	PHP-3.0
+PostgreSQL+	PostgreSQL+
 PostgreSQL	PostgreSQL
 Python-2.0	PSF
 Python-2.0	Python
 Python-2.0	Python ..
+Python-2.0+	Python-2.0+
 Python-2.0	Python-2.0
 Python-2.0	Python Copyright
 Python-2.0	Python License ..
 Python-2.0	Python Software Foundation License
 QPL-1.0	QPL
 QPL-1.0	QPL ..
+QPL-1.0+	QPL-1.0+
 QPL-1.0	QPL-1.0
+RHeCos-1.1+	RHeCos-1.1+
 RHeCos-1.1	RHeCos-1.1
+RPL-1.5+	RPL-1.5+
 RPL-1.5	RPL-1.5
+RPSL-1.0+	RPSL-1.0+
 RPSL-1.0	RPSL-1.0
+RSCPL+	RSCPL+
 RSCPL	RSCPL
 Ruby	GPL-2.0+ or Ruby
 Ruby	GPLv2+ or Ruby
+Ruby+	Ruby+
 Ruby	Ruby
+SAX-PD+	SAX-PD+
 SAX-PD	SAX-PD
+SimPL-2.0+	SimPL-2.0+
 SimPL-2.0	SimPL-2.0
+Sleepycat+	Sleepycat+
 Sleepycat	Sleepycat
+SPL-1.0+	SPL-1.0+
 SPL-1.0	SPL-1.0
+SugarCRM-1.1.3+	SugarCRM-1.1.3+
 SugarCRM-1.1.3	SugarCRM-1.1.3
 SUSE-AGPL-3.0+	AGPLv3+
 SUSE-Apache-2.0+	ASLv2.0+
@@ -377,6 +526,7 @@ SUSE-GPL-3.0-with-FLOSS-exception	GPL-3.0 with exceptions for certain FLOSS lice
 SUSE-GPL-3.0+-with-font-exception	GPLv3+ with exceptions (Fedora)
 SUSE-GPL-3.0+-with-openssl-exception	GPLv3+ with openssl linking exception
 SUSE-GPL-3.0-with-openssl-exception	GPLv3 with openssl linking exception (see e.g. courier-authlib 0.64.0)
+SUSE-GPL-3.0-with-template-exception	See e.g. dh-make from debian (debian/copyright)
 SUSE-IBPL-1.0	http://www.firebirdsql.org/en/interbase-public-license/
 SUSE-IDPL-1.0	http://www.firebirdsql.org/en/initial-developer-s-public-license-version-1-0/
 SUSE-IEEE	Corresponds to https://fedoraproject.org/wiki/Licensing/IEEEDocLicense
@@ -429,23 +579,36 @@ SUSE-XFree86-1.0	The old version of the XFree86 license is not upstream at SPDX.
 SUSE-XFree86-with-font-exception	XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license
 SUSE-xinetd	Xinedt license (Fedora also uses a custom license here)
 SUSE-XSL-Lint	http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets)
+VSL-1.0+	VSL-1.0+
 VSL-1.0	VSL-1.0
+W3C+	W3C+
 W3C	W3C
 W3C	W3C Software License
+Watcom-1.0+	Watcom-1.0+
 Watcom-1.0	Watcom-1.0
+WXwindows+	WXwindows+
 WXwindows	WXwindows
+XFree86-1.1+	XFree86-1.1+
 XFree86-1.1	XFree86-1.1
+Xnet+	Xnet+
 Xnet	Xnet
+YPL-1.0+	YPL-1.0+
 YPL-1.0	YPL-1.0
+YPL-1.1+	YPL-1.1+
 YPL-1.1	YPL-1.1
+Zimbra-1.3+	Zimbra-1.3+
 Zimbra-1.3	Zimbra-1.3
 Zlib	zlib
+Zlib+	Zlib+
 Zlib	Zlib
 Zlib	zlib/libpng License
 Zlib	Zlib License
+ZPL-1.1+	ZPL-1.1+
 ZPL-1.1	ZPL-1.1
 ZPL-2.0	Zope Public License
 ZPL-2.0	ZPL
+ZPL-2.0+	ZPL-2.0+
 ZPL-2.0	ZPL-2.0
+ZPL-2.1+	ZPL-2.1+
 ZPL-2.1	ZPL 2.1
 ZPL-2.1	ZPL-2.1
diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes
index 5a06dd0..38d8721 100644
--- a/obs-service-format_spec_file.changes
+++ b/obs-service-format_spec_file.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Oct  6 13:08:22 UTC 2012 - coolo@suse.com
+
+- allow a + variant for all spdx licenses
+
 -------------------------------------------------------------------
 Tue Sep 25 12:29:17 UTC 2012 - coolo@suse.com