Hello community,
here is the log from the commit of package obs-service-format_spec_file for
openSUSE:Factory checked in at 2018-02-21 14:05:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-format_spec_file (Old)
and /work/SRC/openSUSE:Factory/.obs-service-format_spec_file.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-format_spec_file"
Wed Feb 21 14:05:56 2018 rev:72 rq:576961 version:20180215
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-format_spec_file/obs-service-format_spec_file.changes
2017-11-16 13:57:58.368238132 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-format_spec_file.new/obs-service-format_spec_file.changes
2018-02-21 14:06:06.277783342 +0100
@@ -1,0 +2,13 @@
+Thu Feb 15 11:07:31 UTC 2018 - [email protected]
+
+- Update to version 20180215:
+ + map GPL-1.0 to GPL-1.0-only
+
+-------------------------------------------------------------------
+Wed Feb 14 17:30:08 UTC 2018 - [email protected]
+
+- Update to version 20180214:
+ + adapt license list for SPDX 3.0
+ + remove readd-exceptions.patch
+
+-------------------------------------------------------------------
Old:
----
obs-service-format_spec_file-20171107.tar.bz2
readd-exceptions.patch
New:
----
obs-service-format_spec_file-20180215.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-format_spec_file.spec ++++++
--- /var/tmp/diff_new_pack.eMFASJ/_old 2018-02-21 14:06:07.193750383 +0100
+++ /var/tmp/diff_new_pack.eMFASJ/_new 2018-02-21 14:06:07.193750383 +0100
@@ -1,7 +1,7 @@
#
# spec file for package obs-service-format_spec_file
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,17 +17,15 @@
Name: obs-service-format_spec_file
-Version: 20171107
+Version: 20180215
Release: 0
Summary: An OBS source service: reformats a spec file to SUSE standard
-License: GPL-2.0
+License: GPL-2.0-only
Group: Development/Tools/Building
Url: https://github.com/openSUSE/obs-service-format_spec_file
# osc service dr
Source: %{name}-%{version}.tar.bz2
-Patch0: readd-exceptions.patch
Requires: obs-service-source_validator
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -42,7 +40,6 @@
%prep
%setup
-%patch0 -p1
%build
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.eMFASJ/_old 2018-02-21 14:06:07.237748800 +0100
+++ /var/tmp/diff_new_pack.eMFASJ/_new 2018-02-21 14:06:07.241748656 +0100
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-format-spec-file
-Version: 20171107
+Version: 20180215
Binary: obs-service-format-spec-file
Maintainer: Adrian Schroeter <[email protected]>
Architecture: all
++++++ obs-service-format_spec_file-20171107.tar.bz2 ->
obs-service-format_spec_file-20180215.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-format_spec_file-20171107/README.md
new/obs-service-format_spec_file-20180215/README.md
--- old/obs-service-format_spec_file-20171107/README.md 2017-11-07
10:40:36.000000000 +0100
+++ new/obs-service-format_spec_file-20180215/README.md 2018-02-15
12:05:12.000000000 +0100
@@ -5,89 +5,71 @@
License Tag | Description
----------- | -----------
-Glide | 3dfx Glide License
+0BSD | BSD Zero Clause License
+AAL | Attribution Assurance License
Abstyles | Abstyles License
+Adobe-2006 | Adobe Systems Incorporated Source Code License Agreement
+Adobe-Glyph | Adobe Glyph List License
+ADSL | Amazon Digital Services License
AFL-1.1 | Academic Free License v1.1
AFL-1.2 | Academic Free License v1.2
AFL-2.0 | Academic Free License v2.0
AFL-2.1 | Academic Free License v2.1
AFL-3.0 | Academic Free License v3.0
-AMPAS | Academy of Motion Picture Arts and Sciences BSD
-APL-1.0 | Adaptive Public License 1.0
-Adobe-Glyph | Adobe Glyph List License
-APAFML | Adobe Postscript AFM License
-Adobe-2006 | Adobe Systems Incorporated Source Code License Agreement
-AGPL-1.0 | Affero General Public License v1.0
Afmparse | Afmparse License
+AGPL-1.0 | Affero General Public License v1.0
+AGPL-3.0-only | GNU Affero General Public License v3.0 only
+AGPL-3.0-or-later | GNU Affero General Public License v3.0 or later
Aladdin | Aladdin Free Public License
-ADSL | Amazon Digital Services License
AMDPLPA | AMD's plpa_map.c License
+AML | Apple MIT License
+AMPAS | Academy of Motion Picture Arts and Sciences BSD
ANTLR-PD | ANTLR Software Rights Notice
Apache-1.0 | Apache License 1.0
Apache-1.1 | Apache License 1.1
Apache-2.0 | Apache License 2.0
-AML | Apple MIT License
+APAFML | Adobe Postscript AFM License
+APL-1.0 | Adaptive Public License 1.0
APSL-1.0 | Apple Public Source License 1.0
APSL-1.1 | Apple Public Source License 1.1
APSL-1.2 | Apple Public Source License 1.2
APSL-2.0 | Apple Public Source License 2.0
-Artistic-1.0 | Artistic License 1.0
-Artistic-1.0-Perl | Artistic License 1.0 (Perl)
Artistic-1.0-cl8 | Artistic License 1.0 w/clause 8
+Artistic-1.0-Perl | Artistic License 1.0 (Perl)
+Artistic-1.0 | Artistic License 1.0
Artistic-2.0 | Artistic License 2.0
-AAL | Attribution Assurance License
Bahyph | Bahyph License
Barr | Barr License
Beerware | Beerware License
BitTorrent-1.0 | BitTorrent Open Source License v1.0
BitTorrent-1.1 | BitTorrent Open Source License v1.1
-BSL-1.0 | Boost Software License 1.0
Borceux | Borceux license
-BSD-2-Clause | BSD 2-clause "Simplified" License
-BSD-2-Clause-FreeBSD | BSD 2-clause FreeBSD License
-BSD-2-Clause-NetBSD | BSD 2-clause NetBSD License
-BSD-3-Clause | BSD 3-clause "New" or "Revised" License
-BSD-3-Clause-Clear | BSD 3-clause Clear License
-BSD-3-Clause-No-Nuclear-License | BSD 3-Clause No Nuclear License
+BSD-1-Clause | BSD 1-Clause License
+BSD-2-Clause-FreeBSD | BSD 2-Clause FreeBSD License
+BSD-2-Clause-NetBSD | BSD 2-Clause NetBSD License
+BSD-2-Clause-Patent | BSD-2-Clause Plus Patent License
+BSD-2-Clause | BSD 2-Clause "Simplified" License
+BSD-3-Clause-Attribution | BSD with attribution
+BSD-3-Clause-Clear | BSD 3-Clause Clear License
+BSD-3-Clause-LBNL | Lawrence Berkeley National Labs BSD variant license
BSD-3-Clause-No-Nuclear-License-2014 | BSD 3-Clause No Nuclear License 2014
+BSD-3-Clause-No-Nuclear-License | BSD 3-Clause No Nuclear License
BSD-3-Clause-No-Nuclear-Warranty | BSD 3-Clause No Nuclear Warranty
-BSD-4-Clause | BSD 4-clause "Original" or "Old" License
+BSD-3-Clause | BSD 3-Clause "New" or "Revised" License
+BSD-4-Clause-UC | BSD-4-Clause (University of California-Specific)
+BSD-4-Clause | BSD 4-Clause "Original" or "Old" License
BSD-Protection | BSD Protection License
BSD-Source-Code | BSD Source Code Attribution
-BSD-3-Clause-Attribution | BSD with attribution
-0BSD | BSD Zero Clause License
-BSD-4-Clause-UC | BSD-4-Clause (University of California-Specific)
+BSL-1.0 | Boost Software License 1.0
bzip2-1.0.5 | bzip2 and libbzip2 License v1.0.5
bzip2-1.0.6 | bzip2 and libbzip2 License v1.0.6
Caldera | Caldera License
-CECILL-1.0 | CeCILL Free Software License Agreement v1.0
-CECILL-1.1 | CeCILL Free Software License Agreement v1.1
-CECILL-2.0 | CeCILL Free Software License Agreement v2.0
-CECILL-2.1 | CeCILL Free Software License Agreement v2.1
-CECILL-B | CeCILL-B Free Software License Agreement
-CECILL-C | CeCILL-C Free Software License Agreement
-ClArtistic | Clarified Artistic License
-MIT-CMU | CMU License
-CNRI-Jython | CNRI Jython License
-CNRI-Python | CNRI Python License
-CNRI-Python-GPL-Compatible | CNRI Python Open Source GPL Compatible License
Agreement
-CPOL-1.02 | Code Project Open License 1.02
-CDDL-1.0 | Common Development and Distribution License 1.0
-CDDL-1.1 | Common Development and Distribution License 1.1
-CPAL-1.0 | Common Public Attribution License 1.0
-CPL-1.0 | Common Public License 1.0
CATOSL-1.1 | Computer Associates Trusted Open Source License 1.1
-Condor-1.1 | Condor Public License v1.1
CC-BY-1.0 | Creative Commons Attribution 1.0
CC-BY-2.0 | Creative Commons Attribution 2.0
CC-BY-2.5 | Creative Commons Attribution 2.5
CC-BY-3.0 | Creative Commons Attribution 3.0
CC-BY-4.0 | Creative Commons Attribution 4.0
-CC-BY-ND-1.0 | Creative Commons Attribution No Derivatives 1.0
-CC-BY-ND-2.0 | Creative Commons Attribution No Derivatives 2.0
-CC-BY-ND-2.5 | Creative Commons Attribution No Derivatives 2.5
-CC-BY-ND-3.0 | Creative Commons Attribution No Derivatives 3.0
-CC-BY-ND-4.0 | Creative Commons Attribution No Derivatives 4.0
CC-BY-NC-1.0 | Creative Commons Attribution Non Commercial 1.0
CC-BY-NC-2.0 | Creative Commons Attribution Non Commercial 2.0
CC-BY-NC-2.5 | Creative Commons Attribution Non Commercial 2.5
@@ -103,12 +85,35 @@
CC-BY-NC-SA-2.5 | Creative Commons Attribution Non Commercial Share Alike 2.5
CC-BY-NC-SA-3.0 | Creative Commons Attribution Non Commercial Share Alike 3.0
CC-BY-NC-SA-4.0 | Creative Commons Attribution Non Commercial Share Alike 4.0
+CC-BY-ND-1.0 | Creative Commons Attribution No Derivatives 1.0
+CC-BY-ND-2.0 | Creative Commons Attribution No Derivatives 2.0
+CC-BY-ND-2.5 | Creative Commons Attribution No Derivatives 2.5
+CC-BY-ND-3.0 | Creative Commons Attribution No Derivatives 3.0
+CC-BY-ND-4.0 | Creative Commons Attribution No Derivatives 4.0
CC-BY-SA-1.0 | Creative Commons Attribution Share Alike 1.0
CC-BY-SA-2.0 | Creative Commons Attribution Share Alike 2.0
CC-BY-SA-2.5 | Creative Commons Attribution Share Alike 2.5
CC-BY-SA-3.0 | Creative Commons Attribution Share Alike 3.0
CC-BY-SA-4.0 | Creative Commons Attribution Share Alike 4.0
CC0-1.0 | Creative Commons Zero v1.0 Universal
+CDDL-1.0 | Common Development and Distribution License 1.0
+CDDL-1.1 | Common Development and Distribution License 1.1
+CDLA-Permissive-1.0 | Community Data License Agreement Permissive 1.0
+CDLA-Sharing-1.0 | Community Data License Agreement Sharing 1.0
+CECILL-1.0 | CeCILL Free Software License Agreement v1.0
+CECILL-1.1 | CeCILL Free Software License Agreement v1.1
+CECILL-2.0 | CeCILL Free Software License Agreement v2.0
+CECILL-2.1 | CeCILL Free Software License Agreement v2.1
+CECILL-B | CeCILL-B Free Software License Agreement
+CECILL-C | CeCILL-C Free Software License Agreement
+ClArtistic | Clarified Artistic License
+CNRI-Jython | CNRI Jython License
+CNRI-Python-GPL-Compatible | CNRI Python Open Source GPL Compatible License
Agreement
+CNRI-Python | CNRI Python License
+Condor-1.1 | Condor Public License v1.1
+CPAL-1.0 | Common Public Attribution License 1.0
+CPL-1.0 | Common Public License 1.0
+CPOL-1.02 | Code Project Open License 1.02
Crossword | Crossword License
CrystalStacker | CrystalStacker License
CUA-OPL-1.0 | CUA Office Public License v1.0
@@ -116,131 +121,142 @@
curl | curl License
D-FSL-1.0 | Deutsche Freie Software Lizenz
diffmark | diffmark license
-WTFPL | Do What The F*ck You Want To Public License
DOC | DOC License
Dotseqn | Dotseqn License
DSDP | DSDP License
dvipdfm | dvipdfm License
-EPL-1.0 | Eclipse Public License 1.0
ECL-1.0 | Educational Community License v1.0
ECL-2.0 | Educational Community License v2.0
-eGenix | eGenix.com Public License 1.1.0
EFL-1.0 | Eiffel Forum License v1.0
EFL-2.0 | Eiffel Forum License v2.0
-MIT-advertising | Enlightenment License (e16)
-MIT-enna | enna License
+eGenix | eGenix.com Public License 1.1.0
Entessa | Entessa Public License v1.0
+EPL-1.0 | Eclipse Public License 1.0
+EPL-2.0 | Eclipse Public License 2.0
ErlPL-1.1 | Erlang Public License v1.1
EUDatagrid | EU DataGrid Software License
EUPL-1.0 | European Union Public License 1.0
EUPL-1.1 | European Union Public License 1.1
+EUPL-1.2 | European Union Public License 1.2
Eurosym | Eurosym License
Fair | Fair License
-MIT-feh | feh License
Frameworx-1.0 | Frameworx Open License 1.0
FreeImage | FreeImage Public License v1.0
-FTL | Freetype Project License
FSFAP | FSF All Permissive License
FSFUL | FSF Unlimited License
FSFULLR | FSF Unlimited License (with License Retention)
+FTL | Freetype Project License
+GFDL-1.1-only | GNU Free Documentation License v1.1 only
+GFDL-1.1-or-later | GNU Free Documentation License v1.1 or later
+GFDL-1.2-only | GNU Free Documentation License v1.2 only
+GFDL-1.2-or-later | GNU Free Documentation License v1.2 or later
+GFDL-1.3-only | GNU Free Documentation License v1.3 only
+GFDL-1.3-or-later | GNU Free Documentation License v1.3 or later
Giftware | Giftware License
GL2PS | GL2PS License
+Glide | 3dfx Glide License
Glulxe | Glulxe License
-AGPL-3.0 | GNU Affero General Public License v3.0
-GFDL-1.1 | GNU Free Documentation License v1.1
-GFDL-1.2 | GNU Free Documentation License v1.2
-GFDL-1.3 | GNU Free Documentation License v1.3
-GPL-1.0 | GNU General Public License v1.0 only
-GPL-2.0 | GNU General Public License v2.0 only
-GPL-3.0 | GNU General Public License v3.0 only
-LGPL-2.1 | GNU Lesser General Public License v2.1 only
-LGPL-3.0 | GNU Lesser General Public License v3.0 only
-LGPL-2.0 | GNU Library General Public License v2 only
gnuplot | gnuplot License
+GPL-1.0-only | GNU General Public License v1.0 only
+GPL-1.0-or-later | GNU General Public License v1.0 or later
+GPL-2.0-only | GNU General Public License v2.0 only
+GPL-2.0-or-later | GNU General Public License v2.0 or later
+GPL-3.0-only | GNU General Public License v3.0 only
+GPL-3.0-or-later | GNU General Public License v3.0 or later
gSOAP-1.3b | gSOAP Public License v1.3b
HaskellReport | Haskell Language Report License
-HPND | Historic Permission Notice and Disclaimer
+HPND | Historical Permission Notice and Disclaimer
IBM-pibs | IBM PowerPC Initialization and Boot Software
-IPL-1.0 | IBM Public License v1.0
ICU | ICU License
+IJG | Independent JPEG Group License
ImageMagick | ImageMagick License
iMatix | iMatix Standard Function Library Agreement
Imlib2 | Imlib2 License
-IJG | Independent JPEG Group License
Info-ZIP | Info-ZIP License
Intel-ACPI | Intel ACPI Software License Agreement
Intel | Intel Open Source License
Interbase-1.0 | Interbase Public License v1.0
IPA | IPA Font License
+IPL-1.0 | IBM Public License v1.0
ISC | ISC License
JasPer-2.0 | JasPer License
JSON | JSON License
-LPPL-1.0 | LaTeX Project Public License v1.0
-LPPL-1.1 | LaTeX Project Public License v1.1
-LPPL-1.2 | LaTeX Project Public License v1.2
-LPPL-1.3a | LaTeX Project Public License v1.3a
-LPPL-1.3c | LaTeX Project Public License v1.3c
+LAL-1.2 | Licence Art Libre 1.2
+LAL-1.3 | Licence Art Libre 1.3
Latex2e | Latex2e License
-BSD-3-Clause-LBNL | Lawrence Berkeley National Labs BSD variant license
Leptonica | Leptonica License
+LGPL-2.0-only | GNU Library General Public License v2 only
+LGPL-2.0-or-later | GNU Library General Public License v2 or later
+LGPL-2.1-only | GNU Lesser General Public License v2.1 only
+LGPL-2.1-or-later | GNU Lesser General Public License v2.1 or later
+LGPL-3.0-only | GNU Lesser General Public License v3.0 only
+LGPL-3.0-or-later | GNU Lesser General Public License v3.0 or later
LGPLLR | Lesser General Public License For Linguistic Resources
Libpng | libpng License
libtiff | libtiff License
-LAL-1.2 | Licence Art Libre 1.2
-LAL-1.3 | Licence Art Libre 1.3
LiLiQ-P-1.1 | Licence Libre du Qu?bec ? Permissive version 1.1
-LiLiQ-Rplus-1.1 | Licence Libre du Qu?bec ? R?ciprocit? forte version 1.1
LiLiQ-R-1.1 | Licence Libre du Qu?bec ? R?ciprocit? version 1.1
-LPL-1.02 | Lucent Public License v1.02
+LiLiQ-Rplus-1.1 | Licence Libre du Qu?bec ? R?ciprocit? forte version 1.1
LPL-1.0 | Lucent Public License Version 1.0
+LPL-1.02 | Lucent Public License v1.02
+LPPL-1.0 | LaTeX Project Public License v1.0
+LPPL-1.1 | LaTeX Project Public License v1.1
+LPPL-1.2 | LaTeX Project Public License v1.2
+LPPL-1.3a | LaTeX Project Public License v1.3a
+LPPL-1.3c | LaTeX Project Public License v1.3c
MakeIndex | MakeIndex License
-MTLL | Matrix Template Library License
-MS-PL | Microsoft Public License
-MS-RL | Microsoft Reciprocal License
-MirOS | MirOS Licence
-MITNFA | MIT +no-false-attribs license
+MirOS | MirOS License
+MIT-advertising | Enlightenment License (e16)
+MIT-CMU | CMU License
+MIT-enna | enna License
+MIT-feh | feh License
MIT | MIT License
+MITNFA | MIT +no-false-attribs license
Motosoto | Motosoto License
+mpich2 | mpich2 License
MPL-1.0 | Mozilla Public License 1.0
MPL-1.1 | Mozilla Public License 1.1
-MPL-2.0 | Mozilla Public License 2.0
MPL-2.0-no-copyleft-exception | Mozilla Public License 2.0 (no copyleft
exception)
-mpich2 | mpich2 License
+MPL-2.0 | Mozilla Public License 2.0
+MS-PL | Microsoft Public License
+MS-RL | Microsoft Reciprocal License
+MTLL | Matrix Template Library License
Multics | Multics License
Mup | Mup License
NASA-1.3 | NASA Open Source Agreement 1.3
Naumen | Naumen Public License
NBPL-1.0 | Net Boolean Public License v1
+NCSA | University of Illinois/NCSA Open Source License
Net-SNMP | Net-SNMP License
NetCDF | NetCDF license
+Newsletr | Newsletr License
NGPL | Nethack General Public License
+NLOD-1.0 | Norwegian Licence for Open Government Data
+NLPL | No Limit Public License
+Nokia | Nokia Open Source License
NOSL | Netizen Open Source License
+Noweb | Noweb License
NPL-1.0 | Netscape Public License v1.0
NPL-1.1 | Netscape Public License v1.1
-Newsletr | Newsletr License
-NLPL | No Limit Public License
-Nokia | Nokia Open Source License
NPOSL-3.0 | Non-Profit Open Software License 3.0
-NLOD-1.0 | Norwegian Licence for Open Government Data
-Noweb | Noweb License
NRL | NRL License
NTP | NTP License
-Nunit | Nunit License
+OCCT-PL | Open CASCADE Technology Public License
OCLC-2.0 | OCLC Research Public License 2.0
ODbL-1.0 | ODC Open Database License v1.0
-PDDL-1.0 | ODC Public Domain Dedication & License 1.0
-OCCT-PL | Open CASCADE Technology Public License
+OFL-1.0 | SIL Open Font License 1.0
+OFL-1.1 | SIL Open Font License 1.1
OGTSL | Open Group Test Suite License
-OLDAP-2.2.2 | Open LDAP Public License 2.2.2
OLDAP-1.1 | Open LDAP Public License v1.1
OLDAP-1.2 | Open LDAP Public License v1.2
OLDAP-1.3 | Open LDAP Public License v1.3
OLDAP-1.4 | Open LDAP Public License v1.4
-OLDAP-2.0 | Open LDAP Public License v2.0 (or possibly 2.0A and 2.0B)
OLDAP-2.0.1 | Open LDAP Public License v2.0.1
+OLDAP-2.0 | Open LDAP Public License v2.0 (or possibly 2.0A and 2.0B)
OLDAP-2.1 | Open LDAP Public License v2.1
-OLDAP-2.2 | Open LDAP Public License v2.2
OLDAP-2.2.1 | Open LDAP Public License v2.2.1
+OLDAP-2.2.2 | Open LDAP Public License 2.2.2
+OLDAP-2.2 | Open LDAP Public License v2.2
OLDAP-2.3 | Open LDAP Public License v2.3
OLDAP-2.4 | Open LDAP Public License v2.4
OLDAP-2.5 | Open LDAP Public License v2.5
@@ -248,14 +264,15 @@
OLDAP-2.7 | Open LDAP Public License v2.7
OLDAP-2.8 | Open LDAP Public License v2.8
OML | Open Market License
+OpenSSL | OpenSSL License
OPL-1.0 | Open Public License v1.0
+OSET-PL-2.1 | OSET Public License version 2.1
OSL-1.0 | Open Software License 1.0
OSL-1.1 | Open Software License 1.1
OSL-2.0 | Open Software License 2.0
OSL-2.1 | Open Software License 2.1
OSL-3.0 | Open Software License 3.0
-OpenSSL | OpenSSL License
-OSET-PL-2.1 | OSET Public License version 2.1
+PDDL-1.0 | ODC Public Domain Dedication & License 1.0
PHP-3.0 | PHP License v3.0
PHP-3.01 | PHP License v3.01
Plexus | Plexus Classworlds License
@@ -263,62 +280,60 @@
psfrag | psfrag License
psutils | psutils License
Python-2.0 | Python License 2.0
-QPL-1.0 | Q Public License 1.0
Qhull | Qhull License
+QPL-1.0 | Q Public License 1.0
Rdisc | Rdisc License
-RPSL-1.0 | RealNetworks Public Source License v1.0
+RHeCos-1.1 | Red Hat eCos Public License v1.1
RPL-1.1 | Reciprocal Public License 1.1
RPL-1.5 | Reciprocal Public License 1.5
-RHeCos-1.1 | Red Hat eCos Public License v1.1
-RSCPL | Ricoh Source Code Public License
+RPSL-1.0 | RealNetworks Public Source License v1.0
RSA-MD | RSA Message-Digest License
+RSCPL | Ricoh Source Code Public License
Ruby | Ruby License
SAX-PD | Sax Public Domain Notice
Saxpath | Saxpath License
SCEA | SCEA Shared Source License
-SWL | Scheme Widget Library (SWL) Software License Agreement
-SMPPL | Secure Messaging Protocol Public License
Sendmail | Sendmail License
SGI-B-1.0 | SGI Free Software License B v1.0
SGI-B-1.1 | SGI Free Software License B v1.1
SGI-B-2.0 | SGI Free Software License B v2.0
-OFL-1.0 | SIL Open Font License 1.0
-OFL-1.1 | SIL Open Font License 1.1
SimPL-2.0 | Simple Public License 2.0
+SISSL-1.2 | Sun Industry Standards Source License v1.2
+SISSL | Sun Industry Standards Source License v1.1
Sleepycat | Sleepycat License
+SMLNJ | Standard ML of New Jersey License
+SMPPL | Secure Messaging Protocol Public License
SNIA | SNIA Public License 1.1
Spencer-86 | Spencer License 86
Spencer-94 | Spencer License 94
Spencer-99 | Spencer License 99
-SMLNJ | Standard ML of New Jersey License
-SugarCRM-1.1.3 | SugarCRM Public License v1.1.3
-SISSL | Sun Industry Standards Source License v1.1
-SISSL-1.2 | Sun Industry Standards Source License v1.2
SPL-1.0 | Sun Public License v1.0
-Watcom-1.0 | Sybase Open Watcom Public License 1.0
+SugarCRM-1.1.3 | SugarCRM Public License v1.1.3
+SWL | Scheme Widget Library (SWL) Software License Agreement
TCL | TCL/TK License
TCP-wrappers | TCP Wrappers License
-Unlicense | The Unlicense
TMate | TMate Open Source License
TORQUE-1.1 | TORQUE v2.5+ Software License v1.1
TOSL | Trusster Open Source License
Unicode-DFS-2015 | Unicode License Agreement - Data Files and Software (2015)
Unicode-DFS-2016 | Unicode License Agreement - Data Files and Software (2016)
Unicode-TOU | Unicode Terms of Use
+Unlicense | The Unlicense
UPL-1.0 | Universal Permissive License v1.0
-NCSA | University of Illinois/NCSA Open Source License
Vim | Vim License
VOSTROM | VOSTROM Public License for Open Source
VSL-1.0 | Vovida Software License v1.0
-W3C-20150513 | W3C Software Notice and Document License (2015-05-13)
W3C-19980720 | W3C Software Notice and License (1998-07-20)
+W3C-20150513 | W3C Software Notice and Document License (2015-05-13)
W3C | W3C Software Notice and License (2002-12-31)
+Watcom-1.0 | Sybase Open Watcom Public License 1.0
Wsuipa | Wsuipa License
-Xnet | X.Net License
+WTFPL | Do What The F*ck You Want To Public License
X11 | X11 License
Xerox | Xerox License
XFree86-1.1 | XFree86 License 1.1
xinetd | xinetd License
+Xnet | X.Net License
xpp | XPP License
XSkat | XSkat License
YPL-1.0 | Yahoo! Public License v1.0
@@ -327,8 +342,8 @@
Zend-2.0 | Zend License v2.0
Zimbra-1.3 | Zimbra Public License v1.3
Zimbra-1.4 | Zimbra Public License v1.4
-Zlib | zlib License
zlib-acknowledgement | zlib/libpng License with Acknowledgement
+Zlib | zlib License
ZPL-1.1 | Zope Public License 1.1
ZPL-2.0 | Zope Public License 2.0
ZPL-2.1 | Zope Public License 2.1
@@ -364,7 +379,6 @@
|SUSE-GPL-2.0-with-linking-exception|
|SUSE-GPL-2.0-with-openssl-exception|
|SUSE-GPL-2.0-with-plugin-exception|
-|SUSE-GPL-3.0+-with-autoconf-exception|
|SUSE-GPL-3.0+-with-font-exception|
|SUSE-GPL-3.0+-with-openssl-exception|
|SUSE-GPL-3.0-with-FLOSS-exception|
@@ -381,16 +395,13 @@
|SUSE-Innernet-2.00|
|SUSE-LDPL-2.0|
|SUSE-LGPL-2.0-with-linking-exception|
-|SUSE-LGPL-2.1+-with-GCC-exception|
|SUSE-LGPL-2.1-with-digia-exception-1.1|
|SUSE-LGPL-2.1-with-nokia-exception-1.1|
-|SUSE-LGPL-3.0-with-openssl-exception|
|SUSE-Liberation|
|SUSE-MIT-Khronos|
|SUSE-Manpages|
|SUSE-Matplotlib|
|SUSE-MgOpen|
-|SUSE-NonFree|
|SUSE-Oasis-Specification-Notice|
|SUSE-OldFSFDocLicense|
|SUSE-OpenPublication-1.0|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-format_spec_file-20171107/fetch-licenses.sh
new/obs-service-format_spec_file-20180215/fetch-licenses.sh
--- old/obs-service-format_spec_file-20171107/fetch-licenses.sh 2017-11-07
10:40:36.000000000 +0100
+++ new/obs-service-format_spec_file-20180215/fetch-licenses.sh 2018-02-15
12:05:12.000000000 +0100
@@ -7,7 +7,7 @@
echo "$l+ $l+" >> licenses_changes.ptxt ;
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
+for i in `w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text"
| sed -e 's, *License Text.*, LT,; s,Y\s*LT$,LT,; s,Y\s*LT$,LT,; s,\s*LT$,,;
s,.* ,,;'`; do
echo "$i $i" >> licenses_changes.ntxt ;
echo "$i+ $i+" >> licenses_changes.ptxt ;
done
@@ -34,7 +34,7 @@
echo "License Tag | Description"
echo "----------- | -----------"
IFS=:
-w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text" | sed -e
's, *Y *License Text,,; s, *License Text,,; s,\s* \([^ ]*\)$,:\1,' | while read
text license; do
+w3m -dump -cols 1000 http://spdx.org/licenses/ | grep "License Text" | sed -e
's, *License Text.*, LT,; s,Y\s*LT$,LT,; s,Y\s*LT$,LT,; s,\s*LT$,,;; s,\s*
\([^ ]*\)$,:\1,' | while read text license; do
echo "$license | $text"
echo "$license" >> licenses_changes.raw
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-format_spec_file-20171107/licences_exceptions.txt
new/obs-service-format_spec_file-20180215/licences_exceptions.txt
--- old/obs-service-format_spec_file-20171107/licences_exceptions.txt
2017-11-07 10:40:36.000000000 +0100
+++ new/obs-service-format_spec_file-20180215/licences_exceptions.txt
2018-02-15 12:05:12.000000000 +0100
@@ -2,6 +2,7 @@
Autoconf-exception-2.0
Autoconf-exception-3.0
Bison-exception-2.2
+Bootloader-exception
CLISP-exception-2.0
Classpath-exception-2.0
DigiRule-FOSS-exception
@@ -12,6 +13,7 @@
GCC-exception-3.1
LZMA-exception
Libtool-exception
+Linux-syscall-note
Nokia-Qt-exception-1.1
OCCT-exception-1.0
Qwt-exception-1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-format_spec_file-20171107/licenses_changes.txt
new/obs-service-format_spec_file-20180215/licenses_changes.txt
--- old/obs-service-format_spec_file-20171107/licenses_changes.txt
2017-11-07 10:40:36.000000000 +0100
+++ new/obs-service-format_spec_file-20180215/licenses_changes.txt
2018-02-15 12:05:12.000000000 +0100
@@ -19,12 +19,16 @@
AFL-3.0+ AFL-3.0+
AGPL-1.0 AGPL-1.0
AGPL-1.0+ AGPL-1.0+
-AGPL-3.0 AGPL-3.0
-AGPL-3.0 AGPLv3
-AGPL-3.0 Affero GPL
-AGPL-3.0+ AGPL-3.0+
-AGPL-3.0+ AGPLv3+
-AGPL-3.0+ SUSE-AGPL-3.0+
+AGPL-3.0-only AGPL-3.0
+AGPL-3.0-only AGPL-3.0-only
+AGPL-3.0-only AGPLv3
+AGPL-3.0-only Affero GPL
+AGPL-3.0-only+ AGPL-3.0-only+
+AGPL-3.0-or-later AGPL-3.0+
+AGPL-3.0-or-later AGPL-3.0-or-later
+AGPL-3.0-or-later AGPLv3+
+AGPL-3.0-or-later SUSE-AGPL-3.0+
+AGPL-3.0-or-later+ AGPL-3.0-or-later+
AMDPLPA AMDPLPA
AMDPLPA+ AMDPLPA+
AML AML
@@ -97,6 +101,8 @@
Artistic-2.0 Artistic 2.0
Artistic-2.0 Artistic-2.0
Artistic-2.0+ Artistic-2.0+
+BSD-1-Clause BSD-1-Clause
+BSD-1-Clause+ BSD-1-Clause+
BSD-2-Clause BSD 2 Clause
BSD-2-Clause BSD 2 clause
BSD-2-Clause BSD 2-Clause
@@ -109,7 +115,9 @@
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-2-Clause-Patent BSD-2-Clause-Patent
BSD-2-Clause-Patent https://opensource.org/licenses/BSDplusPatent
+BSD-2-Clause-Patent+ BSD-2-Clause-Patent+
BSD-3-Clause BSD (3-Clause)
BSD-3-Clause BSD 3-Clause
BSD-3-Clause BSD 3-clause (or similar)
@@ -234,6 +242,10 @@
CDDL-1.0+ CDDL-1.0+
CDDL-1.1 CDDL-1.1
CDDL-1.1+ CDDL-1.1+
+CDLA-Permissive-1.0 CDLA-Permissive-1.0
+CDLA-Permissive-1.0+ CDLA-Permissive-1.0+
+CDLA-Sharing-1.0 CDLA-Sharing-1.0
+CDLA-Sharing-1.0+ CDLA-Sharing-1.0+
CECILL-1.0 CECILL-1.0
CECILL-1.0+ CECILL-1.0+
CECILL-1.1 CECILL-1.1
@@ -306,12 +318,16 @@
EPL-1.0 Eclipse Public License 1.0
EPL-1.0 Eclipse-1.0
EPL-1.0+ EPL-1.0+
+EPL-2.0 EPL-2.0
+EPL-2.0+ EPL-2.0+
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+
+EUPL-1.2 EUPL-1.2
+EUPL-1.2+ EUPL-1.2+
Entessa Entessa
Entessa+ Entessa+
ErlPL-1.1 ErlPL-1.1
@@ -333,74 +349,99 @@
Frameworx-1.0+ Frameworx-1.0+
FreeImage FreeImage
FreeImage+ FreeImage+
-GFDL-1.1 GFDL 1.1
-GFDL-1.1 GFDL v1.1
-GFDL-1.1 GFDL-1.1
-GFDL-1.1 GFDLv1.1
-GFDL-1.1 GNU Free Documentation License, Version 1.1 (GFDL 1.1)
-GFDL-1.1+ FDL v1.1 or later
-GFDL-1.1+ GFDL-1.1+
-GFDL-1.1+ SUSE-GFDL-1.1+
-GFDL-1.2 GFDL 1.2
-GFDL-1.2 GFDL v1.2
-GFDL-1.2 GFDL-1.2
-GFDL-1.2 GFDLv1.2
-GFDL-1.2 GNU Free Documentation License, Version 1.2 (GFDL 1.2)
-GFDL-1.2+ FDL-1.2+
-GFDL-1.2+ FDLv1.2+
-GFDL-1.2+ GFDL-1.2+
-GFDL-1.2+ GFDLv1.2+
-GFDL-1.2+ SUSE-GFDL-1.2+
-GFDL-1.3 GFDL-1.3
-GFDL-1.3 GNU Free Documentation License, Version 1.3 (GFDL 1.3)
-GFDL-1.3+ FDL-1.3+
-GFDL-1.3+ GFDL-1.3+
-GFDL-1.3+ SUSE-GFDL-1.3+
+GFDL-1.1-only GFDL 1.1
+GFDL-1.1-only GFDL v1.1
+GFDL-1.1-only GFDL-1.1
+GFDL-1.1-only GFDL-1.1-only
+GFDL-1.1-only GFDLv1.1
+GFDL-1.1-only GNU Free Documentation License, Version 1.1 (GFDL 1.1)
+GFDL-1.1-only+ GFDL-1.1-only+
+GFDL-1.1-or-later FDL v1.1 or later
+GFDL-1.1-or-later GFDL-1.1+
+GFDL-1.1-or-later GFDL-1.1-or-later
+GFDL-1.1-or-later SUSE-GFDL-1.1+
+GFDL-1.1-or-later+ GFDL-1.1-or-later+
+GFDL-1.2-only GFDL 1.2
+GFDL-1.2-only GFDL v1.2
+GFDL-1.2-only GFDL-1.2
+GFDL-1.2-only GFDL-1.2-only
+GFDL-1.2-only GFDLv1.2
+GFDL-1.2-only GNU Free Documentation License, Version 1.2 (GFDL 1.2)
+GFDL-1.2-only+ GFDL-1.2-only+
+GFDL-1.2-or-later FDL-1.2+
+GFDL-1.2-or-later FDLv1.2+
+GFDL-1.2-or-later GFDL-1.2+
+GFDL-1.2-or-later GFDL-1.2-or-later
+GFDL-1.2-or-later GFDLv1.2+
+GFDL-1.2-or-later SUSE-GFDL-1.2+
+GFDL-1.2-or-later+ GFDL-1.2-or-later+
+GFDL-1.3-only GFDL-1.3
+GFDL-1.3-only GFDL-1.3-only
+GFDL-1.3-only GNU Free Documentation License, Version 1.3 (GFDL 1.3)
+GFDL-1.3-only+ GFDL-1.3-only+
+GFDL-1.3-or-later FDL-1.3+
+GFDL-1.3-or-later GFDL-1.3+
+GFDL-1.3-or-later GFDL-1.3-or-later
+GFDL-1.3-or-later SUSE-GFDL-1.3+
+GFDL-1.3-or-later+ GFDL-1.3-or-later+
GL2PS GL2PS
GL2PS+ GL2PS+
-GPL-1.0 GPL-1.0
-GPL-1.0+ GPL+
-GPL-1.0+ GPL-1.0+
-GPL-1.0+ GPLv1+
-GPL-2.0 GLPv2
-GPL-2.0 GNU GPL v2
-GPL-2.0 GNU General Public License (GPL) v2
-GPL-2.0 GNU General Public License version 2 (GPL v2)
-GPL-2.0 GPL 2.0
-GPL-2.0 GPL v2
-GPL-2.0 GPL v2 only
-GPL-2.0 GPL v2.0
-GPL-2.0 GPL-2
-GPL-2.0 GPL-2.0
-GPL-2.0 GPL2
-GPL-2.0 GPLv2
-GPL-2.0+ GNU General Public License version 2 or later
-GPL-2.0+ GNU General Public License version 2 or later (GPL v2 or later)
-GPL-2.0+ GNU General Public License version 2 or later (GPLv2 or later)
-GPL-2.0+ GPL v2 or later
-GPL-2.0+ GPL v2+
-GPL-2.0+ GPL v2.0 or later
-GPL-2.0+ GPL-2+
-GPL-2.0+ GPL-2.0 or later
-GPL-2.0+ GPL-2.0+
-GPL-2.0+ GPL2+
-GPL-2.0+ GPLv2 or later
-GPL-2.0+ GPLv2+
-GPL-2.0+ libGeoIPUpdate is GPLv2 or later
-GPL-3.0 GNU GPL version 3
-GPL-3.0 GNU General Public License version 3 (GPLv3)
-GPL-3.0 GPL 3
-GPL-3.0 GPL v3
-GPL-3.0 GPL v3 only
-GPL-3.0 GPL-3
-GPL-3.0 GPL-3.0
-GPL-3.0 GPL3
-GPL-3.0 GPLv3
-GPL-3.0+ GNU GPL v3 or later
-GPL-3.0+ GPL v3 or later
-GPL-3.0+ GPL-3+
-GPL-3.0+ GPL-3.0+
-GPL-3.0+ GPLv3+
+GPL-1.0-only GPL-1.0
+GPL-1.0-only GPL-1.0-only
+GPL-1.0-only+ GPL-1.0-only+
+GPL-1.0-or-later GPL+
+GPL-1.0-or-later GPL-1.0+
+GPL-1.0-or-later GPL-1.0-or-later
+GPL-1.0-or-later GPLv1+
+GPL-1.0-or-later+ GPL-1.0-or-later+
+GPL-2.0-only GLPv2
+GPL-2.0-only GNU GPL v2
+GPL-2.0-only GNU General Public License (GPL) v2
+GPL-2.0-only GNU General Public License version 2 (GPL v2)
+GPL-2.0-only GPL 2.0
+GPL-2.0-only GPL v2
+GPL-2.0-only GPL v2 only
+GPL-2.0-only GPL v2.0
+GPL-2.0-only GPL-2
+GPL-2.0-only GPL-2.0
+GPL-2.0-only GPL-2.0-only
+GPL-2.0-only GPL2
+GPL-2.0-only GPLv2
+GPL-2.0-only+ GPL-2.0-only+
+GPL-2.0-or-later GNU General Public License version 2 or later
+GPL-2.0-or-later GNU General Public License version 2 or later (GPL v2
or later)
+GPL-2.0-or-later GNU General Public License version 2 or later (GPLv2 or
later)
+GPL-2.0-or-later GPL v2 or later
+GPL-2.0-or-later GPL v2+
+GPL-2.0-or-later GPL v2.0 or later
+GPL-2.0-or-later GPL-2+
+GPL-2.0-or-later GPL-2.0 or later
+GPL-2.0-or-later GPL-2.0+
+GPL-2.0-or-later GPL-2.0-or-later
+GPL-2.0-or-later GPL2+
+GPL-2.0-or-later GPLv2 or later
+GPL-2.0-or-later GPLv2+
+GPL-2.0-or-later libGeoIPUpdate is GPLv2 or later
+GPL-2.0-or-later+ GPL-2.0-or-later+
+GPL-3.0-only GNU GPL version 3
+GPL-3.0-only GNU General Public License version 3 (GPLv3)
+GPL-3.0-only GPL 3
+GPL-3.0-only GPL v3
+GPL-3.0-only GPL v3 only
+GPL-3.0-only GPL-3
+GPL-3.0-only GPL-3.0
+GPL-3.0-only GPL-3.0-only
+GPL-3.0-only GPL3
+GPL-3.0-only GPLv3
+GPL-3.0-only+ GPL-3.0-only+
+GPL-3.0-or-later GNU GPL v3 or later
+GPL-3.0-or-later GPL v3 or later
+GPL-3.0-or-later GPL-3+
+GPL-3.0-or-later GPL-3.0+
+GPL-3.0-or-later GPL-3.0-or-later
+GPL-3.0-or-later GPLv3+
+GPL-3.0-or-later WITH Autoconf-exception-3.0 GPLv3+ with exceptions
+GPL-3.0-or-later+ GPL-3.0-or-later+
GPL-3.0-with-Qt-Company-Qt-exception-1.1
GPL-3.0-with-Qt-Company-Qt-exception-1.1
Giftware Giftware
Giftware+ Giftware+
@@ -452,40 +493,56 @@
LAL-1.2+ LAL-1.2+
LAL-1.3 LAL-1.3
LAL-1.3+ LAL-1.3+
-LGPL-2.0 LGPL v2
-LGPL-2.0 LGPL v2.0 only
-LGPL-2.0 LGPL-2.0
-LGPL-2.0 LGPLv2
-LGPL-2.0 LGPLv2.0
-LGPL-2.0+ LGPL v2 or later
-LGPL-2.0+ LGPL v2.0 or later
-LGPL-2.0+ LGPL-2.0+
-LGPL-2.0+ LGPLv2.0+
-LGPL-2.1 GNU LGPLv2.1
-LGPL-2.1 GNU Lesser General Public License version 2.1 (LGPL v2.1)
-LGPL-2.1 LGPL 2.1
-LGPL-2.1 LGPL v2.1
-LGPL-2.1 LGPL v2.1 only
-LGPL-2.1 LGPL-2.1
-LGPL-2.1 LGPL2.1
-LGPL-2.1 LGPLv2.1
-LGPL-2.1+ GNU LGPL v2.1 or later
-LGPL-2.1+ LGPL V2+
-LGPL-2.1+ LGPL v2+
-LGPL-2.1+ LGPL v2.1 or later
-LGPL-2.1+ LGPL v2.1+
-LGPL-2.1+ LGPL-2.0.1 or later
-LGPL-2.1+ LGPL-2.1+
-LGPL-2.1+ LGPLv2+
-LGPL-2.1+ LGPLv2.1+
+LGPL-2.0-only LGPL v2
+LGPL-2.0-only LGPL v2.0 only
+LGPL-2.0-only LGPL-2.0
+LGPL-2.0-only LGPL-2.0-only
+LGPL-2.0-only LGPLv2
+LGPL-2.0-only LGPLv2.0
+LGPL-2.0-only+ LGPL-2.0-only+
+LGPL-2.0-or-later LGPL v2 or later
+LGPL-2.0-or-later LGPL v2.0 or later
+LGPL-2.0-or-later LGPL-2.0+
+LGPL-2.0-or-later LGPL-2.0-or-later
+LGPL-2.0-or-later LGPLv2.0+
+LGPL-2.0-or-later+ LGPL-2.0-or-later+
+LGPL-2.1-only GNU LGPLv2.1
+LGPL-2.1-only GNU Lesser General Public License version 2.1 (LGPL v2.1)
+LGPL-2.1-only LGPL 2.1
+LGPL-2.1-only LGPL v2.1
+LGPL-2.1-only LGPL v2.1 only
+LGPL-2.1-only LGPL-2.1
+LGPL-2.1-only LGPL-2.1-only
+LGPL-2.1-only LGPL2.1
+LGPL-2.1-only LGPLv2.1
+LGPL-2.1-only+ LGPL-2.1-only+
+LGPL-2.1-or-later GNU LGPL v2.1 or later
+LGPL-2.1-or-later LGPL V2+
+LGPL-2.1-or-later LGPL v2+
+LGPL-2.1-or-later LGPL v2.1 or later
+LGPL-2.1-or-later LGPL v2.1+
+LGPL-2.1-or-later LGPL-2.0.1 or later
+LGPL-2.1-or-later LGPL-2.1+
+LGPL-2.1-or-later LGPL-2.1-or-later
+LGPL-2.1-or-later LGPLv2+
+LGPL-2.1-or-later LGPLv2.1+
+LGPL-2.1-or-later WITH GCC-exception-2.0 LGPLv2+ with GCC exception
+LGPL-2.1-or-later WITH GCC-exception-2.0
SUSE-LGPL-2.1+-with-GCC-exception
+LGPL-2.1-or-later+ LGPL-2.1-or-later+
LGPL-2.1-with-Qt-Company-Qt-exception-1.1
LGPL-2.1-with-Qt-Company-Qt-exception-1.1
-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 LGPLv3
-LGPL-3.0+ LGPL v3 or later
-LGPL-3.0+ LGPL-3.0+
-LGPL-3.0+ LGPLv3+
+LGPL-3.0-only GNU Lesser General Public License (LGPL), Version 3
+LGPL-3.0-only GNU Lesser General Public License version 3 (LGPL v3)
+LGPL-3.0-only LGPL-3.0
+LGPL-3.0-only LGPL-3.0-only
+LGPL-3.0-only LGPLv3
+LGPL-3.0-only WITH openvpn-openssl-exception
SUSE-LGPL-3.0-with-openssl-exception
+LGPL-3.0-only WITH openvpn-openssl-exception e.g python-psycopg2
+LGPL-3.0-only+ LGPL-3.0-only+
+LGPL-3.0-or-later LGPL v3 or later
+LGPL-3.0-or-later LGPL-3.0+
+LGPL-3.0-or-later LGPL-3.0-or-later
+LGPL-3.0-or-later LGPLv3+
+LGPL-3.0-or-later+ LGPL-3.0-or-later+
LGPL-3.0-with-Qt-Company-Qt-exception-1.1
LGPL-3.0-with-Qt-Company-Qt-exception-1.1
LGPLLR LGPLLR
LGPLLR+ LGPLLR+
@@ -605,10 +662,10 @@
Newsletr+ Newsletr+
Nokia Nokia
Nokia+ Nokia+
+NonFree NonFree licenses
+NonFree SUSE-NonFree
Noweb Noweb
Noweb+ Noweb+
-Nunit Nunit
-Nunit+ Nunit+
OCCT-PL OCCT-PL
OCCT-PL+ OCCT-PL+
OCLC-2.0 OCLC-2.0
@@ -803,8 +860,6 @@
SUSE-GPL-2.0-with-openssl-exception+ SUSE-GPL-2.0-with-openssl-exception+
SUSE-GPL-2.0-with-plugin-exception Many GPL-2.0 licensed applications
grant an exception that permits non-free plugins (e.g. from gstreamer) to be
linked against them
SUSE-GPL-2.0-with-plugin-exception+ SUSE-GPL-2.0-with-plugin-exception+
-SUSE-GPL-3.0+-with-autoconf-exception GPLv3+ with exceptions
-SUSE-GPL-3.0+-with-autoconf-exception+ SUSE-GPL-3.0+-with-autoconf-exception+
SUSE-GPL-3.0+-with-font-exception GPLv3+ with exceptions (Fedora)
SUSE-GPL-3.0+-with-font-exception+ SUSE-GPL-3.0+-with-font-exception+
SUSE-GPL-3.0+-with-openssl-exception GPLv3+ with openssl linking exception
@@ -837,14 +892,10 @@
SUSE-LDPL-2.0+ SUSE-LDPL-2.0+
SUSE-LGPL-2.0-with-linking-exception LGPL-2.0-with-linking-exception
SUSE-LGPL-2.0-with-linking-exception+ SUSE-LGPL-2.0-with-linking-exception+
-SUSE-LGPL-2.1+-with-GCC-exception LGPLv2+ with GCC exception
-SUSE-LGPL-2.1+-with-GCC-exception+ SUSE-LGPL-2.1+-with-GCC-exception+
SUSE-LGPL-2.1-with-digia-exception-1.1 qtcreator November 2012
SUSE-LGPL-2.1-with-digia-exception-1.1+
SUSE-LGPL-2.1-with-digia-exception-1.1+
SUSE-LGPL-2.1-with-nokia-exception-1.1 Part of the license choice in libqt4
SUSE-LGPL-2.1-with-nokia-exception-1.1+
SUSE-LGPL-2.1-with-nokia-exception-1.1+
-SUSE-LGPL-3.0-with-openssl-exception e.g python-psycopg2
-SUSE-LGPL-3.0-with-openssl-exception+ SUSE-LGPL-3.0-with-openssl-exception+
SUSE-Liberation LiberationFontsLicense (Fedora calls this the
Liberation license - it will be easier to get it upstream if we adopt that)
SUSE-Liberation+ SUSE-Liberation+
SUSE-MIT-Khronos
https://github.com/KhronosGroup/KTX/blob/master/lib/loader.c
@@ -855,8 +906,6 @@
SUSE-Matplotlib+ SUSE-Matplotlib+
SUSE-MgOpen MgOpen Fonts license (similar to Bitstream Vera but with
additional language)
SUSE-MgOpen+ SUSE-MgOpen+
-SUSE-NonFree NonFree licenses
-SUSE-NonFree+ SUSE-NonFree+
SUSE-Oasis-Specification-Notice Oasis-Specification-Notice
SUSE-Oasis-Specification-Notice+ SUSE-Oasis-Specification-Notice+
SUSE-OldFSFDocLicense Tracked by Fedora as OldFSFDocLicense (see
https://fedoraproject.org/wiki/Licensing:OldFSFDocLicense?rd=Licensing/OldFSFDocLicense)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-format_spec_file-20171107/patch_license
new/obs-service-format_spec_file-20180215/patch_license
--- old/obs-service-format_spec_file-20171107/patch_license 2017-11-07
10:40:36.000000000 +0100
+++ new/obs-service-format_spec_file-20180215/patch_license 2018-02-15
12:05:12.000000000 +0100
@@ -182,7 +182,7 @@
my @licenses = ();
if ( $license =~ /^(.*?)\(([^)]*)\)(.*?)$/ ) {
my ($head, $paren, $tail) = ($1, $2, $3);
- if ($paren =~ /AND|OR/) {
+ if ($paren =~ /AND|OR/i) {
$head = replace_spdx_and($head);
$tail = replace_spdx_and($tail);
$paren = replace_spdx_and($paren);
@@ -191,9 +191,10 @@
}
}
- for (split(/(\s+(?:AND|OR)\s+)/, $license, -1)) {
- $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:AND|OR)\s+)/;
+ for (split(/(\s+(?:AND|OR)\s+)/i, $license, -1)) {
+ $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:AND|OR)\s+)/i;
s/\s+/ /g;
+ $_ = uc $_ if /(\s+(?:AND|OR)\s+)/i;
push @licenses, $_;
}
#print STDERR "AFTE '" . join('', @licenses) . "'\n";
@@ -304,7 +305,7 @@
}
# evil epoch removal
next if ( /^Epoch:/ );
- $_ =~ s/%{?epoch}?[:-]//g;
+ $_ =~ s/%\{?epoch}?[:-]//g;
$_ =~ s/ 0:/ /g if ( /^requires/i || /^buildreq/i );
if ( /^BuildRequires:/ ) {
@@ -423,7 +424,7 @@
for my $xx (sort { length($b) <=> length($a) } keys (%{$definelist})) {
$_ =~ s/\Q$xx\E/$definelist->{$xx}/;
}
- $_ =~ s/%{\?[^\}]*}//;
+ $_ =~ s/%\{\?[^\}]*}//;
if ($debug) {
warn "after: $_\n";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-format_spec_file-20171107/prepare_spec
new/obs-service-format_spec_file-20180215/prepare_spec
--- old/obs-service-format_spec_file-20171107/prepare_spec 2017-11-07
10:40:36.000000000 +0100
+++ new/obs-service-format_spec_file-20180215/prepare_spec 2018-02-15
12:05:12.000000000 +0100
@@ -176,7 +176,7 @@
my @licenses = ();
if ( $license =~ /^(.*?)\(([^)]*)\)(.*?)$/ ) {
my ($head, $paren, $tail) = ($1, $2, $3);
- if ($paren =~ /AND|OR/) {
+ if ($paren =~ /AND|OR/i) {
$head = replace_spdx_and($head);
$tail = replace_spdx_and($tail);
$paren = replace_spdx_and($paren);
@@ -185,9 +185,10 @@
}
}
- for (split(/(\s+(?:AND|OR)\s+)/, $license, -1)) {
- $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:AND|OR)\s+)/;
+ for (split(/(\s+(?:AND|OR)\s+)/i, $license, -1)) {
+ $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:AND|OR)\s+)/i;
s/\s+/ /g;
+ $_ = uc $_ if /(\s+(?:AND|OR)\s+)/i;
push @licenses, $_;
}
#print STDERR "AFTE '" . join('', @licenses) . "'\n";
