From eb831a45619ca1254c34fc40842c5f4d45b85d6804d425dfba5aaf8d1f4e14a9 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 8 Oct 2012 11:03:29 +0000 Subject: [PATCH 1/2] - fix duplicate for Artistic-1.0+ OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=99 --- licenses_changes.txt | 2 +- obs-service-format_spec_file.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/licenses_changes.txt b/licenses_changes.txt index daea58d..e8ee75f 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -494,7 +494,7 @@ SugarCRM-1.1.3 SugarCRM-1.1.3 SUSE-AGPL-3.0+ AGPLv3+ SUSE-Apache-2.0+ ASLv2.0+ SUSE-Arphic http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE -SUSE-Artistic-1.0+ Artistic-1.0+ +SUSE-Artistic-1.0+ SUSE-Artistic-1.0+ SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 38d8721..5c925a0 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 8 11:03:10 UTC 2012 - coolo@suse.com + +- fix duplicate for Artistic-1.0+ + ------------------------------------------------------------------- Sat Oct 6 13:08:22 UTC 2012 - coolo@suse.com From 963458bf8222c725f4e200ba38e0b46233656304088e9584ac47a722ed79b6c0 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 8 Oct 2012 11:45:44 +0000 Subject: [PATCH 2/2] - remove SUSE- prefix for licenses that only have a + OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=100 --- fetch-licenses.sh | 3 ++- licenses_changes.txt | 26 ++++++++++++++++---------- obs-service-format_spec_file.changes | 5 +++++ 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/fetch-licenses.sh b/fetch-licenses.sh index e850cd3..abc5d9b 100644 --- a/fetch-licenses.sh +++ b/fetch-licenses.sh @@ -1,4 +1,4 @@ -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 +curl -s "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 ; echo "$i+ $i+" >> licenses_changes.txt ; @@ -6,3 +6,4 @@ 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 e8ee75f..9d8d0ed 100644 --- a/licenses_changes.txt +++ b/licenses_changes.txt @@ -16,7 +16,9 @@ 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+ AGPL-3.0 AGPLv3 +AGPL-3.0+ SUSE-AGPL-3.0+ ANTLR-PD+ ANTLR-PD+ ANTLR-PD ANTLR-PD Apache-1.0+ Apache-1.0+ @@ -39,7 +41,9 @@ Apache-2.0 ASL2 Apache-2.0 ASL 2.0 Apache-2.0 ASLv.. Apache-2.0 ASLv2 +Apache-2.0+ ASLv2.0+ Apache-2.0 ASLv2.0 +Apache-2.0+ SUSE-Apache-2.0+ Apache-2.0 The Apache Software License APL-1.0+ APL-1.0+ APL-1.0 APL-1.0 @@ -60,6 +64,7 @@ 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-1.0+ SUSE-Artistic-1.0+ Artistic-2.0+ Artistic-2.0+ Artistic-2.0 Artistic 2.0 Artistic-2.0 Artistic-2.0 @@ -222,21 +227,29 @@ Fair+ Fair+ Fair Fair Frameworx-1.0+ Frameworx-1.0+ Frameworx-1.0 Frameworx-1.0 +GFDL-1.1+ FDL v1.1 or later 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.1+ SUSE-GFDL-1.1+ +GFDL-1.2+ FDL-1.2+ +GFDL-1.2+ FDLv1.2+ 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 GFDLv1.2 GFDL-1.2 GFDL v1.2 GFDL-1.2 GNU Free Documentation License, Version 1.2 (GFDL 1.2) +GFDL-1.2+ SUSE-GFDL-1.2+ +GFDL-1.3+ FDL-1.3+ 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) +GFDL-1.3+ SUSE-GFDL-1.3+ GPL-1.0+ GPL+ GPL-1.0++ GPL-1.0++ GPL-1.0+ GPL-1.0+ @@ -392,8 +405,11 @@ 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+ MPL 1.1 or later +MPL-1.1+ MPLv1.1+ MPL-1.1 MPLv1.1 MPL-1.1 MPLv1.1 .. +MPL-1.1+ SUSE-MPL-1.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+ @@ -491,10 +507,7 @@ 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+ SUSE-Arphic http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE -SUSE-Artistic-1.0+ SUSE-Artistic-1.0+ SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-BSD-3-Clause-with-non-nuclear-addition BSD-3-Clause with addition which clarifies the software is not licensed for use in design, build or operation of nuclear facility SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 @@ -508,11 +521,6 @@ SUSE-Free-Art-1.3 http://artlibre.org/licence/lal/en SUSE-Freetype Freetype SUSE-Freeware Freeware SUSE-Freeware Freeware license -SUSE-GFDL-1.1+ FDL v1.1 or later -SUSE-GFDL-1.2+ FDL-1.2+ -SUSE-GFDL-1.2+ FDLv1.2+ -SUSE-GFDL-1.2+ GFDLv1.2+ -SUSE-GFDL-1.3+ FDL-1.3+ SUSE-GL2PS-2.0 http://www.geuz.org/gl2ps/COPYING.GL2PS SUSE-Gnuplot Gnuplot SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception @@ -543,8 +551,6 @@ SUSE-MakeIndex http://pastebin.com/CYB22gju (the license used in csindex) SUSE-Manpages Manpages licenses (linux man pages e.g.) SUSE-MgOpen MgOpen Fonts license (similar to Bitstream Vera but with additional language) SUSE-mirror License of the mirror package is quite liberal but prohibits distribution of modified versions. Instead, you should distribute modifications as patches. This is permitted by Section 4 of the Open Source Definition -SUSE-MPL-1.1+ MPL 1.1 or later -SUSE-MPL-1.1+ MPLv1.1+ SUSE-mplus http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html#license SUSE-NetCDF SUSE-NetCDF SUSE-NonFree NonFree licenses diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 5c925a0..27c14f2 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 8 11:45:31 UTC 2012 - coolo@suse.com + +- remove SUSE- prefix for licenses that only have a + + ------------------------------------------------------------------- Mon Oct 8 11:03:10 UTC 2012 - coolo@suse.com