Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2014-09-23 10:42:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old) and /work/SRC/openSUSE:Factory/.spec-cleaner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spec-cleaner" Changes: -------- --- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes 2014-09-06 12:18:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2014-09-23 10:42:58.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 22 13:21:47 UTC 2014 - [email protected] + +- Version bump to 0.6.2: + * Fix iniline mode + * Various small fixes and testsuite expansion + +------------------------------------------------------------------- Old: ---- spec-cleaner-0.6.1.tar.gz New: ---- spec-cleaner-0.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.q3BuYv/_old 2014-09-23 10:42:59.000000000 +0200 +++ /var/tmp/diff_new_pack.q3BuYv/_new 2014-09-23 10:42:59.000000000 +0200 @@ -18,7 +18,7 @@ Name: spec-cleaner -Version: 0.6.1 +Version: 0.6.2 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause ++++++ spec-cleaner-0.6.1.tar.gz -> spec-cleaner-0.6.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-0.6.2/data/excludes-bracketing.txt --- old/spec-cleaner-spec-cleaner-0.6.1/data/excludes-bracketing.txt 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/data/excludes-bracketing.txt 2014-09-19 17:45:33.000000000 +0200 @@ -54,8 +54,9 @@ pretrans preun py_compile -requires_eq +requires_[^\s]* restart_on_update +run_permissions service_(add|del)_[^\s]* setup set_permissions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/data/licenses_changes.txt new/spec-cleaner-spec-cleaner-0.6.2/data/licenses_changes.txt --- old/spec-cleaner-spec-cleaner-0.6.1/data/licenses_changes.txt 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/data/licenses_changes.txt 2014-09-19 17:45:33.000000000 +0200 @@ -1,137 +1,160 @@ AAL AAL AAL+ AAL+ +Abstyles Abstyles +Abstyles+ Abstyles+ +Adobe-Glyph Adobe-Glyph +Adobe-Glyph+ Adobe-Glyph+ +Adobe-2006 Adobe-2006 +Adobe-2006+ Adobe-2006+ +ADSL ADSL +ADSL+ ADSL+ 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 Academic Free License 2.1 AFL-2.1+ AFL-2.1+ AFL-3.0 AFL-3.0 AFL-3.0+ AFL-3.0+ +Afmparse Afmparse +Afmparse+ Afmparse+ 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+ AGPLv3+ +AGPL-3.0 AGPL-3.0 +AGPL-3.0+ AGPL-3.0+ AGPL-3.0+ SUSE-AGPL-3.0+ -ANTLR-PD ANTLR-PD -ANTLR-PD+ ANTLR-PD+ -APL-1.0 APL-1.0 -APL-1.0 APL-1.0 (spdx.org/licenses) -APL-1.0+ APL-1.0+ -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+ Aladdin Aladdin Aladdin+ Aladdin+ +AMDPLPA AMDPLPA +AMDPLPA+ AMDPLPA+ +AML AML +AML+ AML+ +AMPAS AMPAS +AMPAS+ AMPAS+ +ANTLR-PD ANTLR-PD +ANTLR-PD+ ANTLR-PD+ +APAFML APAFML +APAFML+ APAFML+ Apache-1.0 Apache-1.0 Apache-1.0+ Apache-1.0+ -Apache-1.1 ASL 1.1 -Apache-1.1 Apache 1.1 (Indiana University) Apache-1.1 Apache-1.1 Apache-1.1+ Apache-1.1+ -Apache-2.0 ASL 2.0 -Apache-2.0 ASL2 -Apache-2.0 ASLv.. -Apache-2.0 ASLv2 -Apache-2.0 ASLv2.0 -Apache-2.0 Apache 2.0 +Apache-1.1 Apache 1.1 (Indiana University) +Apache-1.1 ASL 1.1 Apache-2.0 Apache License -Apache-2.0 Apache License 2.0 Apache-2.0 Apache License Version 2.0 Apache-2.0 Apache License, Version 2.0 +Apache-2.0 Apache License 2.0 Apache-2.0 Apache Software License Apache-2.0 Apache Software License .. Apache-2.0 Apache Software License, Version 2.0 Apache-2.0 Apache v2.0 +Apache-2.0 Apache 2.0 Apache-2.0 Apache-2.0 -Apache-2.0 The Apache Software License -Apache-2.0+ ASLv2.0+ Apache-2.0+ Apache-2.0+ +Apache-2.0 ASLv.. +Apache-2.0 ASLv2 +Apache-2.0 ASLv2.0 +Apache-2.0+ ASLv2.0+ +Apache-2.0 ASL2 +Apache-2.0 ASL 2.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+ +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 license Artistic-1.0 Artistic License Artistic-1.0 Artistic License .. -Artistic-1.0 Artistic license +Artistic-1.0 Artistic 1.0 Artistic-1.0 Artistic-1.0 -Artistic-1.0 or GPL-1.0+ Perl License Artistic-1.0+ Artistic-1.0+ -Artistic-1.0+ SUSE-Artistic-1.0+ -Artistic-1.0-Perl Artistic-1.0-Perl -Artistic-1.0-Perl+ Artistic-1.0-Perl+ Artistic-1.0-cl8 Artistic-1.0-cl8 Artistic-1.0-cl8+ Artistic-1.0-cl8+ +Artistic-1.0 or GPL-1.0+ Perl License +Artistic-1.0-Perl Artistic-1.0-Perl +Artistic-1.0-Perl+ Artistic-1.0-Perl+ +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+ -BSD-2-Clause BSD 2 Clause +Bahyph Bahyph +Bahyph+ Bahyph+ +Barr Barr +Barr+ Barr+ +Beerware Beerware +Beerware+ Beerware+ +Beerware SUSE-Beerware +BitTorrent-1.0 BitTorrent-1.0 +BitTorrent-1.0+ BitTorrent-1.0+ +BitTorrent-1.1 BitTorrent-1.1 +BitTorrent-1.1+ BitTorrent-1.1+ +Borceux Borceux +Borceux+ Borceux+ +BSD-Protection BSD-Protection +BSD-Protection+ BSD-Protection+ +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 BSD-2c -BSD-2-Clause BSD2c 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 BSD (3-Clause) -BSD-3-Clause BSD 3-Clause -BSD-3-Clause BSD 3-clause (or similar) +BSD-3-Clause-Attribution BSD-3-Clause-Attribution +BSD-3-Clause-Attribution+ BSD-3-Clause-Attribution+ +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+ +BSD-3-Clause BSD 3-clause (or similar) BSD-3-Clause BSD-3-clause (or similar) -BSD-3-Clause BSD3 -BSD-3-Clause BSD3c BSD-3-Clause BSD3c (or similar) BSD-3-Clause BSD3c(or similar) -BSD-3-Clause New BSD License -BSD-3-Clause+ BSD-3-Clause+ BSD-3-Clause-Clear BSD-3-Clause-Clear BSD-3-Clause-Clear+ BSD-3-Clause-Clear+ -BSD-4-Clause BSD-4-Clause +BSD-3-Clause-LBNL BSD-3-Clause-LBNL +BSD-3-Clause-LBNL+ BSD-3-Clause-LBNL+ +BSD-3-Clause New BSD License BSD-4-Clause BSD4c -BSD-4-Clause BSD4c(or similar) +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+ -BitTorrent-1.0 BitTorrent-1.0 -BitTorrent-1.0+ BitTorrent-1.0+ -BitTorrent-1.1 BitTorrent-1.1 -BitTorrent-1.1+ BitTorrent-1.1+ +bzip2-1.0.5 bzip2-1.0.5 +bzip2-1.0.5+ bzip2-1.0.5+ +bzip2-1.0.6 bzip2-1.0.6 +bzip2-1.0.6+ bzip2-1.0.6+ +Caldera Caldera +Caldera+ Caldera+ CATOSL-1.1 CATOSL-1.1 CATOSL-1.1+ CATOSL-1.1+ -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 @@ -140,6 +163,8 @@ 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-ND-4.0 CC-BY-NC-ND-4.0 +CC-BY-NC-ND-4.0+ CC-BY-NC-ND-4.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 @@ -148,6 +173,18 @@ 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-NC-SA-4.0 CC-BY-NC-SA-4.0 +CC-BY-NC-SA-4.0+ CC-BY-NC-SA-4.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-4.0 CC-BY-NC-4.0 +CC-BY-NC-4.0+ CC-BY-NC-4.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 @@ -156,6 +193,8 @@ 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-ND-4.0 CC-BY-ND-4.0 +CC-BY-ND-4.0+ CC-BY-ND-4.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 @@ -163,11 +202,23 @@ CC-BY-SA-2.5 CC by-sa V2.5 CC-BY-SA-2.5 CC-BY-SA-2.5 CC-BY-SA-2.5+ CC-BY-SA-2.5+ -CC-BY-SA-3.0 CC BY-SA 3.0 CC-BY-SA-3.0 CC BY-SA V3.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-4.0 CC-BY-SA-4.0 +CC-BY-SA-4.0+ CC-BY-SA-4.0+ CC-BY-SA-4.0 http://creativecommons.org/licenses/by-sa/4.0/legalcode +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-4.0 CC-BY-4.0 +CC-BY-4.0+ CC-BY-4.0+ CC0-1.0 CC0-1.0 CC0-1.0+ CC0-1.0+ CDDL-1.0 CDDL @@ -176,135 +227,165 @@ CDDL-1.0+ CDDL-1.0+ CDDL-1.1 CDDL-1.1 CDDL-1.1+ CDDL-1.1+ +CECILL-B CECILL-B +CECILL-B+ CECILL-B+ +CECILL-C CECILL-C +CECILL-C+ CECILL-C+ 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+ +Condor-1.1 Condor-1.1 +Condor-1.1+ Condor-1.1+ CPAL-1.0 CPAL-1.0 CPAL-1.0+ CPAL-1.0+ -CPL-1.0 CPL (Common Public License) v1 -CPL-1.0 CPL 1.0 -CPL-1.0 CPL 1.0 ... -CPL-1.0 CPL-1.0 -CPL-1.0 Common Public License - v 1.0 CPL-1.0 Common Public License Version 1.0 CPL-1.0 Common Public License Version 1.0 (CPL1.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 CPL (Common Public License) v1 +CPL-1.0 CPL 1.0 +CPL-1.0 CPL 1.0 ... +CPL-1.0 CPL-1.0 CPL-1.0+ CPL-1.0+ CPOL-1.02 CPOL-1.02 CPOL-1.02+ CPOL-1.02+ +Crossword Crossword +Crossword+ Crossword+ CUA-OPL-1.0 CUA-OPL-1.0 CUA-OPL-1.0+ CUA-OPL-1.0+ -ClArtistic ClArtistic -ClArtistic+ ClArtistic+ -Condor-1.1 Condor-1.1 -Condor-1.1+ Condor-1.1+ +Cube Cube +Cube+ Cube+ D-FSL-1.0 D-FSL-1.0 D-FSL-1.0+ D-FSL-1.0+ +diffmark diffmark +diffmark+ diffmark+ +DOC DOC +DOC+ DOC+ +Dotseqn Dotseqn +Dotseqn+ Dotseqn+ +DSDP DSDP +DSDP+ DSDP+ +dvipdfm dvipdfm +dvipdfm+ dvipdfm+ 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+ +eGenix eGenix +eGenix+ eGenix+ +Entessa Entessa +Entessa+ Entessa+ +EPL-1.0 Eclipse Public License +EPL-1.0 Eclipse Public License 1.0 +EPL-1.0 Eclipse-1.0 EPL-1.0 EPL -EPL-1.0 EPL 1.0 -EPL-1.0 EPL 1.0 ... EPL-1.0 EPL v1.0 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 Eclipse Public License -EPL-1.0 Eclipse Public License 1.0 -EPL-1.0 Eclipse-1.0 EPL-1.0+ EPL-1.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+ -Entessa Entessa -Entessa+ Entessa+ -ErlPL-1.1 ErlPL-1.1 -ErlPL-1.1 Erlang Public License -ErlPL-1.1+ ErlPL-1.1+ -FTL FTL -FTL+ FTL+ +Eurosym Eurosym +Eurosym+ Eurosym+ Fair Fair Fair+ Fair+ Frameworx-1.0 Frameworx-1.0 Frameworx-1.0+ Frameworx-1.0+ -GFDL-1.1 GFDL 1.1 +FSFUL FSFUL +FSFUL+ FSFUL+ +FSFULLR FSFULLR +FSFULLR+ FSFULLR+ +FTL FTL +FTL+ FTL+ +GFDL-1.1+ FDL v1.1 or later 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 GFDL-1.1 GFDL-1.1+ GFDL-1.1+ +GFDL-1.1 GNU Free Documentation License, Version 1.1 (GFDL 1.1) GFDL-1.1+ SUSE-GFDL-1.1+ -GFDL-1.2 GFDL 1.2 +GFDL-1.2+ FDLv1.2+ +GFDL-1.2+ FDL-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 GFDL 1.2 +GFDL-1.2 GFDL-1.2 +GFDL-1.2+ GFDL-1.2+ +GFDL-1.2 GNU Free Documentation License, Version 1.2 (GFDL 1.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+ 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-1.0 +Giftware Giftware +Giftware+ Giftware+ +Glide Glide +Glide+ Glide+ +Glulxe Glulxe +Glulxe+ Glulxe+ +GL2PS GL2PS +GL2PS+ GL2PS+ +gnuplot gnuplot +gnuplot+ gnuplot+ GPL-1.0+ GPL+ -GPL-1.0+ GPL-1.0+ GPL-1.0+ GPLv1+ +GPL-1.0 GPL-1.0 +GPL-1.0+ GPL-1.0+ GPL-1.0++ GPL-1.0++ 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 or later +GPL-2.0 GNU GPL v2 +GPL-2.0 GPL v2 +GPL-2.0 GPLv2 GPL-2.0+ GPL v2+ +GPL-2.0+ GPLv2+ +GPL-2.0 GPL v2 only +GPL-2.0+ GPL v2 or later +GPL-2.0+ GPLv2 or later +GPL-2.0 GPL v2.0 GPL-2.0+ GPL v2.0 or later +GPL-2.0 GPL2 +GPL-2.0 GPL-2 +GPL-2.0+ GPL2+ GPL-2.0+ GPL-2+ -GPL-2.0+ GPL-2.0 or later +GPL-2.0 GPL 2.0 +GPL-2.0 GPL-2.0 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-2.0++ GPL-2.0++ -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-2.0+ GPL-2.0 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 @@ -313,84 +394,108 @@ 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-3.0 GNU GPL version 3 +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 GPL 3 +GPL-3.0 GNU GPL version 3 +GPL-3.0+ GNU GPL v3 or later 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+ GPLv3+ +GPL-3.0 GPL v3 only GPL-3.0+ GPL v3 or later +GPL-3.0 GPL 3 +GPL-3.0 GPL3 +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+ GPLv3+ GPL-3.0++ GPL-3.0++ -GPL-3.0-with-GCC-exception GPL-3.0-with-GCC-exception -GPL-3.0-with-GCC-exception+ GPL-3.0-with-GCC-exception+ 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+ +HaskellReport HaskellReport +HaskellReport+ HaskellReport+ HPND HPND HPND+ HPND+ IBM-pibs IBM-pibs IBM-pibs+ IBM-pibs+ IJG IJG IJG+ IJG+ +IJG SUSE-IJG +ImageMagick ImageMagick +ImageMagick+ ImageMagick+ +iMatix iMatix +iMatix+ iMatix+ +Imlib2 Imlib2 +Imlib2+ Imlib2+ +Intel-ACPI Intel-ACPI +Intel-ACPI+ Intel-ACPI+ +Intel Intel +Intel+ Intel+ IPA IPA -IPA see IPA_Font_License_Agreement_v1.0.txt 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 License ISC+ ISC+ -Imlib2 Imlib2 -Imlib2+ Imlib2+ -Intel Intel -Intel+ Intel+ +ISC ISC License +JasPer-2.0 JasPer-2.0 +JasPer-2.0+ JasPer-2.0+ JSON JSON JSON+ JSON+ +JSON SUSE-JSON +Latex2e Latex2e +Latex2e+ Latex2e+ +Leptonica Leptonica +Leptonica+ Leptonica+ 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 LGPLv2.0 +LGPL-2.0+ LGPLv2.0+ +LGPL-2.0 LGPL v2.0 only LGPL-2.0+ LGPL v2.0 or later +LGPL-2.0 LGPL-2.0 LGPL-2.0+ LGPL-2.0+ -LGPL-2.0+ LGPLv2.0+ LGPL-2.0++ LGPL-2.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 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+ LGPLv2+ +LGPL-2.1+ LGPL V2+ +LGPL-2.1 LGPL v2.1 +LGPL-2.1 LGPLv2.1 LGPL-2.1+ LGPL v2.1+ +LGPL-2.1+ LGPLv2.1+ +LGPL-2.1 LGPL v2.1 only +LGPL-2.1+ LGPL v2.1 or later LGPL-2.1+ LGPL-2.0.1 or later +LGPL-2.1 LGPL 2.1 +LGPL-2.1 LGPL2.1 +LGPL-2.1 LGPL-2.1 LGPL-2.1+ LGPL-2.1+ -LGPL-2.1+ LGPLv2+ -LGPL-2.1+ LGPLv2.1+ LGPL-2.1++ LGPL-2.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+ LGPLv3+ LGPL-3.0+ LGPL v3 or later +LGPL-3.0 LGPL-3.0 LGPL-3.0+ LGPL-3.0+ -LGPL-3.0+ LGPLv3+ LGPL-3.0++ LGPL-3.0++ +Libpng Libpng +Libpng+ Libpng+ +libtiff libtiff +libtiff+ libtiff+ LPL-1.0 LPL-1.0 LPL-1.0+ LPL-1.0+ LPL-1.02 LPL-1.02 @@ -405,68 +510,98 @@ LPPL-1.3a+ LPPL-1.3a+ LPPL-1.3c LPPL .. LPPL-1.3c LPPL-1.3c -LPPL-1.3c TeX-License .. LPPL-1.3c+ LPPL-1.3c+ -Libpng Libpng -Libpng+ Libpng+ +LPPL-1.3c TeX-License .. +MakeIndex MakeIndex +MakeIndex+ MakeIndex+ +MakeIndex SUSE-MakeIndex +MirOS MirOS +MirOS+ MirOS+ +MIT-advertising MIT-advertising +MIT-advertising+ MIT-advertising+ +MIT-CMU MIT-CMU +MIT-CMU+ MIT-CMU+ +MIT-enna MIT-enna +MIT-enna+ MIT-enna+ MIT Expat MIT Expat License +MIT-feh MIT-feh +MIT-feh+ MIT-feh+ MIT MIT -MIT MIT License -MIT MIT License (or similar) +MIT+ MIT+ MIT MIT licence -MIT MIT license MIT MIT-Licence -MIT+ MIT+ -MPL-1.0 MPL-1.0 +MIT MIT license +MIT MIT License +MIT MIT License (or similar) +MITNFA MITNFA +MITNFA+ MITNFA+ +Motosoto Motosoto +Motosoto+ Motosoto+ +mpich2 mpich2 +mpich2+ mpich2+ MPL-1.0 MPLv1.0 +MPL-1.0 MPL-1.0 MPL-1.0+ MPL-1.0+ MPL-1.1 MOZILLA PUBLIC LICENSE (MPL/NPL) -MPL-1.1 MPL-1.1 +MPL-1.1 Mozilla Public License 1.1 MPL-1.1 MPLv1.1 MPL-1.1 MPLv1.1 .. -MPL-1.1 Mozilla Public License 1.1 -MPL-1.1+ MPL 1.1 or later -MPL-1.1+ MPL-1.1+ MPL-1.1+ MPLv1.1+ +MPL-1.1 MPL-1.1 +MPL-1.1+ MPL-1.1+ +MPL-1.1+ MPL 1.1 or later 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 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-PL+ MS-PL+ MS-RL MS-RL MS-RL+ MS-RL+ -MirOS MirOS -MirOS+ MirOS+ -Motosoto Motosoto -Motosoto+ Motosoto+ +MTLL MTLL +MTLL+ MTLL+ Multics Multics Multics+ Multics+ +Mup Mup +Mup+ Mup+ NASA-1.3 NASA-1.3 NASA-1.3+ NASA-1.3+ +Naumen Naumen +Naumen+ Naumen+ NBPL-1.0 NBPL-1.0 NBPL-1.0+ NBPL-1.0+ NCSA NCSA NCSA+ NCSA+ +NetCDF NetCDF +NetCDF+ NetCDF+ +NetCDF SUSE-NetCDF +Newsletr Newsletr +Newsletr+ Newsletr+ NGPL NGPL NGPL+ NGPL+ +NLPL NLPL +NLPL+ NLPL+ +Nokia Nokia +Nokia+ Nokia+ NOSL NOSL NOSL+ NOSL+ +Noweb Noweb +Noweb+ Noweb+ NPL-1.0 NPL-1.0 NPL-1.0+ NPL-1.0+ NPL-1.1 NPL-1.1 NPL-1.1+ NPL-1.1+ NPOSL-3.0 NPOSL-3.0 NPOSL-3.0+ NPOSL-3.0+ +NRL NRL +NRL+ NRL+ NTP NTP NTP+ NTP+ -Naumen Naumen -Naumen+ Naumen+ -Nokia Nokia -Nokia+ Nokia+ +Nunit Nunit +Nunit+ Nunit+ OCLC-2.0 OCLC-2.0 OCLC-2.0+ OCLC-2.0+ ODbL-1.0 ODbL-1.0 @@ -475,10 +610,10 @@ 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 -OFL-1.1+ OFL-1.1+ OGTSL OGTSL OGTSL+ OGTSL+ OLDAP-1.1 OLDAP-1.1 @@ -512,32 +647,44 @@ OLDAP-2.7 OLDAP-2.7 OLDAP-2.7+ OLDAP-2.7+ OLDAP-2.8 OLDAP-2.8 -OLDAP-2.8 openldap 2.8 OLDAP-2.8+ OLDAP-2.8+ -OPL-1.0 OPL-1.0 +OLDAP-2.8 openldap 2.8 +OML OML +OML+ OML+ +OML SUSE-OML +OpenSSL OpenSSL +OpenSSL+ OpenSSL+ OPL-1.0 Open Publication License 1.0 +OPL-1.0 OPL-1.0 OPL-1.0+ OPL-1.0+ OSL-1.0 OSL-1.0 OSL-1.0+ OSL-1.0+ +OSL-1.1 OSL-1.1 +OSL-1.1+ OSL-1.1+ +OSL-1.1 SUSE-OSL-1.1 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+ -OpenSSL OpenSSL -OpenSSL+ OpenSSL+ PDDL-1.0 PDDL-1.0 PDDL-1.0+ PDDL-1.0+ PHP-3.0 PHP-3.0 PHP-3.0+ PHP-3.0+ PHP-3.01 PHP License -PHP-3.01 PHP-3.0.1 PHP-3.01 PHP-3.01 -PHP-3.01 The PHP License, version 3.01 +PHP-3.01 PHP-3.0.1 PHP-3.01+ PHP-3.01+ +PHP-3.01 The PHP License, version 3.01 +Plexus Plexus +Plexus+ Plexus+ PostgreSQL PostgreSQL PostgreSQL+ PostgreSQL+ +psfrag psfrag +psfrag+ psfrag+ +psutils psutils +psutils+ psutils+ Python-2.0 PSF Python-2.0 Python Python-2.0 Python .. @@ -546,10 +693,15 @@ Python-2.0 Python Software Foundation License Python-2.0 Python-2.0 Python-2.0+ Python-2.0+ +Qhull Qhull +Qhull+ Qhull+ +Qhull SUSE-Qhull QPL-1.0 QPL QPL-1.0 QPL .. QPL-1.0 QPL-1.0 QPL-1.0+ QPL-1.0+ +Rdisc Rdisc +Rdisc+ Rdisc+ RHeCos-1.1 RHeCos-1.1 RHeCos-1.1+ RHeCos-1.1+ RPL-1.1 RPL-1.1 @@ -560,57 +712,69 @@ RPSL-1.0+ RPSL-1.0+ RSCPL RSCPL RSCPL+ RSCPL+ -Ruby GPL-2.0+ or Ruby Ruby GPLv2+ or Ruby +Ruby GPL-2.0+ or Ruby Ruby Ruby -Ruby same as ruby's Ruby+ Ruby+ +Ruby same as ruby's +Saxpath Saxpath +Saxpath+ Saxpath+ SAX-PD SAX-PD SAX-PD+ SAX-PD+ +SCEA SCEA +SCEA+ SCEA+ SGI-B-1.0 SGI-B-1.0 SGI-B-1.0+ SGI-B-1.0+ SGI-B-1.1 SGI-B-1.1 SGI-B-1.1+ SGI-B-1.1+ SGI-B-2.0 SGI-B-2.0 SGI-B-2.0+ SGI-B-2.0+ +SimPL-2.0 SimPL-2.0 +SimPL-2.0+ SimPL-2.0+ SISSL SISSL SISSL+ SISSL+ SISSL-1.2 SISSL-1.2 SISSL-1.2+ SISSL-1.2+ +Sleepycat Sleepycat +Sleepycat+ Sleepycat+ SMLNJ SMLNJ SMLNJ+ SMLNJ+ +SNIA SNIA +SNIA+ SNIA+ SPL-1.0 SPL-1.0 SPL-1.0+ SPL-1.0+ +StandardML-NJ StandardML-NJ +StandardML-NJ+ StandardML-NJ+ +SugarCRM-1.1.3 SugarCRM-1.1.3 +SugarCRM-1.1.3+ SugarCRM-1.1.3+ SUSE-Arphic http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE SUSE-Arphic+ SUSE-Arphic+ -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-BSD-3-Clause-with-non-nuclear-addition+ SUSE-BSD-3-Clause-with-non-nuclear-addition+ -SUSE-BSD-Mark-Modifications BSD-Mark-Modifications -SUSE-BSD-Mark-Modifications+ SUSE-BSD-Mark-Modifications+ -SUSE-Beerware Beerware License like http://en.wikipedia.org/wiki/Beerware#License -SUSE-Beerware+ SUSE-Beerware+ SUSE-Bitstream-Vera http://www.xfree86.org/current/LICENSE13.html SUSE-Bitstream-Vera+ SUSE-Bitstream-Vera+ +SUSE-BSD-Mark-Modifications BSD-Mark-Modifications +SUSE-BSD-Mark-Modifications+ SUSE-BSD-Mark-Modifications+ +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-BSD-3-Clause-with-non-nuclear-addition+ SUSE-BSD-3-Clause-with-non-nuclear-addition+ +SUSE-CacertRoot http://www.cacert.org/policy/RootDistributionLicense.php +SUSE-CacertRoot+ SUSE-CacertRoot+ SUSE-CC-Sampling-Plus-1.0 Creative Commons Sampling Plus 1.0 SUSE-CC-Sampling-Plus-1.0+ SUSE-CC-Sampling-Plus-1.0+ SUSE-CPL-0.5 Common Public License 0.5 SUSE-CPL-0.5+ SUSE-CPL-0.5+ -SUSE-CacertRoot http://www.cacert.org/policy/RootDistributionLicense.php -SUSE-CacertRoot+ SUSE-CacertRoot+ SUSE-DMTF Distributed Management Task Force ( see https://fedoraproject.org/wiki/Licensing/DMTF ) SUSE-DMTF+ SUSE-DMTF+ SUSE-Docbook-XSL Copyright (C) 1999-2007 Norman Walsh SUSE-Docbook-XSL+ SUSE-Docbook-XSL+ -SUSE-EULA SUSE End User License Agreement -SUSE-EULA+ SUSE-EULA+ SUSE-Egenix-1.1.0 Egenix Public License Agreement 1.1.0 (e.g. python-egenix-mx-base) http://www.egenix.com/products/python/mxBase/eGenix.com-Public-License-1.1.0.pdf SUSE-Egenix-1.1.0+ SUSE-Egenix-1.1.0+ +SUSE-EULA SUSE End User License Agreement +SUSE-EULA+ SUSE-EULA+ SUSE-FHS See for example, the "FHS" license here: https://launchpad.net/ubuntu/precise/+source/debian-policy/+copyright SUSE-FHS+ SUSE-FHS+ -SUSE-FLTK Fltk -SUSE-FLTK+ SUSE-FLTK+ SUSE-Firmware Firmware license, redistributable unmodified SUSE-Firmware+ SUSE-Firmware+ +SUSE-FLTK Fltk +SUSE-FLTK+ SUSE-FLTK+ SUSE-Free-Art-1.3 http://artlibre.org/licence/lal/en SUSE-Free-Art-1.3+ SUSE-Free-Art-1.3+ SUSE-Freetype Freetype @@ -618,112 +782,102 @@ SUSE-Freeware Freeware SUSE-Freeware Freeware license SUSE-Freeware+ SUSE-Freeware+ +SUSE-Gitslave Similar to LGPL-2.1 but without sections 3 and 13 +SUSE-Gitslave+ SUSE-Gitslave+ SUSE-GL2PS-2.0 http://www.geuz.org/gl2ps/COPYING.GL2PS SUSE-GL2PS-2.0+ SUSE-GL2PS-2.0+ -SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception -SUSE-GPL-2.0+-with-openssl-exception+ SUSE-GPL-2.0+-with-openssl-exception+ -SUSE-GPL-2.0+-with-sane-exception Sane contains many files with an exception to permit linking against proprietary libraries -SUSE-GPL-2.0+-with-sane-exception+ SUSE-GPL-2.0+-with-sane-exception+ -SUSE-GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception +SUSE-Gnuplot Gnuplot +SUSE-Gnuplot+ SUSE-Gnuplot+ +SUSE-GPL-2.0-with-FLOSS-exception GPL-2.0-with-FLOSS-exception SUSE-GPL-2.0-with-FLOSS-exception+ SUSE-GPL-2.0-with-FLOSS-exception+ -SUSE-GPL-2.0-with-OSI-exception GPL-2.0 with linking exception for OSI licenses (see elfutils e.g.) -SUSE-GPL-2.0-with-OSI-exception+ SUSE-GPL-2.0-with-OSI-exception+ SUSE-GPL-2.0-with-linking-exception Copyright holder expressly allows GPL-2.0 component to be linked with components which are not GPL compatible SUSE-GPL-2.0-with-linking-exception+ SUSE-GPL-2.0-with-linking-exception+ +SUSE-GPL-2.0+-with-openssl-exception GPLv2+ with openssl linking exception SUSE-GPL-2.0-with-openssl-exception SPDX does not have this exception SUSE-GPL-2.0-with-openssl-exception+ SUSE-GPL-2.0-with-openssl-exception+ +SUSE-GPL-2.0+-with-openssl-exception+ SUSE-GPL-2.0+-with-openssl-exception+ +SUSE-GPL-2.0-with-OSI-exception GPL-2.0 with linking exception for OSI licenses (see elfutils e.g.) +SUSE-GPL-2.0-with-OSI-exception+ SUSE-GPL-2.0-with-OSI-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-2.0+-with-sane-exception Sane contains many files with an exception to permit linking against proprietary libraries +SUSE-GPL-2.0+-with-sane-exception+ SUSE-GPL-2.0+-with-sane-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 -SUSE-GPL-3.0+-with-openssl-exception+ SUSE-GPL-3.0+-with-openssl-exception+ SUSE-GPL-3.0-with-FLOSS-exception GPL-3.0 with exceptions for certain FLOSS licenses SUSE-GPL-3.0-with-FLOSS-exception+ SUSE-GPL-3.0-with-FLOSS-exception+ -SUSE-GPL-3.0-with-font-exception SUSE-GPL-3.0-with-font-exception +SUSE-GPL-3.0+-with-font-exception GPLv3+ with exceptions (Fedora) +SUSE-GPL-3.0-with-font-exception GPL-3.0-with-font-exception SUSE-GPL-3.0-with-font-exception+ SUSE-GPL-3.0-with-font-exception+ +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 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-openssl-exception+ SUSE-GPL-3.0-with-openssl-exception+ +SUSE-GPL-3.0+-with-openssl-exception+ SUSE-GPL-3.0+-with-openssl-exception+ SUSE-GPL-3.0-with-template-exception See e.g. dh-make from debian (debian/copyright) SUSE-GPL-3.0-with-template-exception+ SUSE-GPL-3.0-with-template-exception+ -SUSE-Gitslave Similar to LGPL-2.1 but without sections 3 and 13 -SUSE-Gitslave+ SUSE-Gitslave+ -SUSE-Gnuplot Gnuplot -SUSE-Gnuplot+ SUSE-Gnuplot+ SUSE-IBPL-1.0 http://www.firebirdsql.org/en/interbase-public-license/ SUSE-IBPL-1.0+ SUSE-IBPL-1.0+ SUSE-IDPL-1.0 http://www.firebirdsql.org/en/initial-developer-s-public-license-version-1-0/ SUSE-IDPL-1.0+ SUSE-IDPL-1.0+ SUSE-IEEE Corresponds to https://fedoraproject.org/wiki/Licensing/IEEEDocLicense SUSE-IEEE+ SUSE-IEEE+ -SUSE-IJG JPEG License -SUSE-IJG+ SUSE-IJG+ -SUSE-ImageMagick ImageMagick -SUSE-ImageMagick+ SUSE-ImageMagick+ SUSE-Innernet-2.0 Inner Net License 2 SUSE-Innernet-2.0+ SUSE-Innernet-2.0+ SUSE-Innernet-2.00 Inner Net License 2.00 SUSE-Innernet-2.00+ SUSE-Innernet-2.00+ -SUSE-JSON JSON License (http://www.json.org/license.html) - also the license of jslint -SUSE-JSON+ SUSE-JSON+ SUSE-LDPL-2.0 http://www.tldp.org/COPYRIGHT.html SUSE-LDPL-2.0+ SUSE-LDPL-2.0+ -SUSE-LGPL-2.0-with-linking-exception SUSE-LGPL-2.0-with-linking-exception +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-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-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-MakeIndex http://pastebin.com/CYB22gju (the license used in csindex) -SUSE-MakeIndex+ SUSE-MakeIndex+ SUSE-Manpages Manpages licenses (linux man pages e.g.) SUSE-Manpages+ SUSE-Manpages+ SUSE-Matplotlib E.g. python -matplotlib -> LICENSE/LICENSE SUSE-Matplotlib+ SUSE-Matplotlib+ SUSE-MgOpen MgOpen Fonts license (similar to Bitstream Vera but with additional language) SUSE-MgOpen+ SUSE-MgOpen+ -SUSE-NetCDF SUSE-NetCDF -SUSE-NetCDF+ SUSE-NetCDF+ +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-mirror+ SUSE-mirror+ +SUSE-mplus http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html#license +SUSE-mplus+ SUSE-mplus+ SUSE-NonFree NonFree licenses SUSE-NonFree+ SUSE-NonFree+ -SUSE-OML Open Market License (tracked by Fedora as OML) -SUSE-OML+ SUSE-OML+ -SUSE-OSL-1.1 OSL-1.1 -SUSE-OSL-1.1+ SUSE-OSL-1.1+ -SUSE-Oasis-Specification-Notice SUSE-Oasis-Specification-Notice +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) SUSE-OldFSFDocLicense+ SUSE-OldFSFDocLicense+ -SUSE-PHP-2.02 PHP 2.02 -SUSE-PHP-2.02+ SUSE-PHP-2.02+ -SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. -SUSE-Permissive+ SUSE-Permissive+ +SUSE-OldFSFDocLicense Tracked by Fedora as OldFSFDocLicense (see https://fedoraproject.org/wiki/Licensing:OldFSFDocLicense?rd=Licensing/OldFSFDocLicense) SUSE-Permissive-Modify-By-Patch Similar to SUSE-Permissive but copyright holder has specified that modification is only allowed by patch SUSE-Permissive-Modify-By-Patch+ SUSE-Permissive-Modify-By-Patch+ +SUSE-Permissive Must not be copyleft. Must not contain patent clauses of any nature. Most not limit ability to copy, modifiy, distribute (through multiple tiers of distribution) and distribute modified versions. Must not impose obligations such as 'advertising clauses' or anything that could be viewed as an 'additional restriction' under GPL-2.0+ or GPL-3.0+. Must not impose obligations such as modification by patch only, or reciprocal clauses. +SUSE-Permissive+ SUSE-Permissive+ +SUSE-PHP-2.02 PHP 2.02 +SUSE-PHP-2.02+ SUSE-PHP-2.02+ +SUSE-Public-Domain Public domain SUSE-Public-Domain Public Domain -SUSE-Public-Domain Public Domain License SUSE-Public-Domain Public Domain, Freeware +SUSE-Public-Domain Public Domain License SUSE-Public-Domain Public Domain. See http://www.sentex.ca/~mw -SUSE-Public-Domain Public domain SUSE-Public-Domain+ SUSE-Public-Domain+ SUSE-Python-1.6 CNRI (http://www.handle.net/python_licenses/python1.6_9-5-00.html) SUSE-Python-1.6+ SUSE-Python-1.6+ SUSE-QWT-1.0 LGPL-2.1 with clarifications. See http://qwt.sourceforge.net/ SUSE-QWT-1.0+ SUSE-QWT-1.0+ -SUSE-Qhull Qhull -SUSE-Qhull+ SUSE-Qhull+ -SUSE-Redistributable-Content This license can _only_ be used for content (i.e. no code, no documentation). Provided there are no restrictions on free (re)distribution of the content, use this license. SUSE-Firmware is a subset of this category. SUSE-Redistributable-Content+ SUSE-Redistributable-Content+ +SUSE-Redistributable-Content This license can _only_ be used for content (i.e. no code, no documentation). Provided there are no restrictions on free (re)distribution of the content, use this license. SUSE-Firmware is a subset of this category. SUSE-Repoze http://repoze.org/license.html SUSE-Repoze+ SUSE-Repoze+ +SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) +SUSE-Sendmail+ SUSE-Sendmail+ SUSE-SGI-FreeB-2.0 Fedora calls this MIT (it is very similar to the MIT) SUSE-SGI-FreeB-2.0+ SUSE-SGI-FreeB-2.0+ SUSE-SIP http://www.riverbankcomputing.co.uk/software/sip/license @@ -734,89 +888,102 @@ SUSE-SNIA-1.0+ SUSE-SNIA-1.0+ SUSE-SNIA-1.1 SNIA 1.1 SUSE-SNIA-1.1+ SUSE-SNIA-1.1+ -SUSE-Sendmail Sendmail License (http://www.sendmail.org/ftp/LICENSE) -SUSE-Sendmail+ SUSE-Sendmail+ SUSE-Sun-Laboratories http://pastebin.com/UubnS3se SUSE-Sun-Laboratories+ SUSE-Sun-Laboratories+ -SUSE-TCL License for TCL (Fedora calls this TCL too. SPDX doesn't have it) -SUSE-TCL+ SUSE-TCL+ -SUSE-TGPPL-1.0 https://zooko.com/uri/URI:DIR2-RO:d23ekhh2b4xashf53ycrfoynkq:y4vpazbrt2beddyhgwcch4sduhnmmefdotlyelojxg4tyzllhb4a/tgppl.html -SUSE-TGPPL-1.0+ SUSE-TGPPL-1.0+ SUSE-TeX http://en.wikipedia.org/wiki/TeX#License SUSE-TeX+ SUSE-TeX+ +SUSE-TGPPL-1.0 https://zooko.com/uri/URI:DIR2-RO:d23ekhh2b4xashf53ycrfoynkq:y4vpazbrt2beddyhgwcch4sduhnmmefdotlyelojxg4tyzllhb4a/tgppl.html +SUSE-TGPPL-1.0+ SUSE-TGPPL-1.0+ SUSE-Ubuntu-Font-License-1.0 http://font.ubuntu.com/licence/ SUSE-Ubuntu-Font-License-1.0+ SUSE-Ubuntu-Font-License-1.0+ -SUSE-Vim SUSE-Vim -SUSE-Vim+ SUSE-Vim+ -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-XFree86-with-font-exception+ SUSE-XFree86-with-font-exception+ -SUSE-XSL-Lint http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets) -SUSE-XSL-Lint+ SUSE-XSL-Lint+ SUSE-Xano https://fedoraproject.org/wiki/Licensing/MinchoFontLicense SUSE-Xano+ SUSE-Xano+ SUSE-Xenonsoft-1.00 http://pastebin.com/PkSpfTbr (part of spectcl) SUSE-Xenonsoft-1.00+ SUSE-Xenonsoft-1.00+ -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-mirror+ SUSE-mirror+ -SUSE-mplus http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/index-en.html#license -SUSE-mplus+ SUSE-mplus+ -SUSE-xinetd Xinedt license (Fedora also uses a custom license here) -SUSE-xinetd+ SUSE-xinetd+ -SimPL-2.0 SimPL-2.0 -SimPL-2.0+ SimPL-2.0+ -Sleepycat Sleepycat -Sleepycat+ Sleepycat+ -SugarCRM-1.1.3 SugarCRM-1.1.3 -SugarCRM-1.1.3+ SugarCRM-1.1.3+ +SUSE-XFree86-with-font-exception+ SUSE-XFree86-with-font-exception+ +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-XSL-Lint http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets) +SUSE-XSL-Lint+ SUSE-XSL-Lint+ +SWL SWL +SWL+ SWL+ +TCL SUSE-TCL +TCL TCL +TCL+ TCL+ +TMate TMate +TMate+ TMate+ +TORQUE-1.1 TORQUE-1.1 +TORQUE-1.1+ TORQUE-1.1+ +TOSL TOSL +TOSL+ TOSL+ Unicode http://www.unicode.org/copyright.html +Unicode-TOU Unicode-TOU +Unicode-TOU+ Unicode-TOU+ Unlicense Unlicense Unlicense+ Unlicense+ +Vim SUSE-Vim +Vim Vim +Vim+ Vim+ +VOSTROM VOSTROM +VOSTROM+ VOSTROM+ VSL-1.0 VSL-1.0 VSL-1.0+ VSL-1.0+ -W3C W3C -W3C W3C Software License -W3C+ W3C+ +Watcom-1.0 Watcom-1.0 +Watcom-1.0+ Watcom-1.0+ +Wsuipa Wsuipa +Wsuipa+ Wsuipa+ WTFPL SUSE-WTFPL-2.0 WTFPL WTFPL WTFPL+ WTFPL+ WXwindows WXwindows WXwindows+ WXwindows+ -Watcom-1.0 Watcom-1.0 -Watcom-1.0+ Watcom-1.0+ +W3C W3C +W3C+ W3C+ +W3C W3C Software License +Xerox Xerox +Xerox+ Xerox+ +XFree86-1.1 XFree86-1.1 +XFree86-1.1+ XFree86-1.1+ +xinetd SUSE-xinetd +xinetd xinetd +xinetd+ xinetd+ +Xnet Xnet +Xnet+ Xnet+ +xpp xpp +xpp+ xpp+ +XSkat XSkat +XSkat+ XSkat+ X11 MIT/X Consortium License X11 MIT/X License X11 MIT/X11 X11 SUSE-XFree86-1.0 X11 X11 +X11+ X11+ X11 X11 (BSD like) X11 X11 MIT X11 X11/MIT -X11+ X11+ -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+ +Zed Zed +Zed+ Zed+ +Zend-2.0 Zend-2.0 +Zend-2.0+ Zend-2.0+ +Zimbra-1.3 Zimbra-1.3 +Zimbra-1.3+ Zimbra-1.3+ +zlib-acknowledgement zlib-acknowledgement +zlib-acknowledgement+ zlib-acknowledgement+ +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 Zope Public License ZPL-2.0+ ZPL-2.0+ ZPL-2.1 ZPL 2.1 ZPL-2.1 ZPL-2.1 ZPL-2.1+ ZPL-2.1+ -Zimbra-1.3 Zimbra-1.3 -Zimbra-1.3+ Zimbra-1.3+ -Zlib Zlib -Zlib Zlib License -Zlib zlib -Zlib zlib/libpng License -Zlib+ Zlib+ -eCos-2.0 eCos-2.0 -eCos-2.0+ eCos-2.0+ -gSOAP-1.3b gSOAP-1.3b -gSOAP-1.3b+ gSOAP-1.3b+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/license-update.sh new/spec-cleaner-spec-cleaner-0.6.2/license-update.sh --- old/spec-cleaner-spec-cleaner-0.6.1/license-update.sh 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/license-update.sh 2014-09-19 17:45:33.000000000 +0200 @@ -19,13 +19,15 @@ #echo "Working in \"${TEMPDIR}\"" pushd "${TEMPDIR}" &> /dev/null verify_fetch "${DOCS}" + # download curl -s "${DOCS}" | grep -v "New format" > licenses_changes.txt - grep ^SUSE- licenses_changes.txt | awk -F' ' '{print $1}' | while read l; do + # for all licenses add variant with '+' at the end + sed -n '/New format/d;s@^\(SUSE-[^[:blank:]]*\)[[:blank:]].*@\1@p' licenses_changes.txt | while read l; do echo -e "${l}+\t${l}+\n" >> licenses_changes.txt done verify_fetch "${SPDX}" - for i in `w3m -dump -cols 1000 "${SPDX}" | grep "License Text" | sed -e 's, *Y *License Text,,; s, *License Text,,; s,.* ,,;'`; do + for i in `w3m -dump -cols 1000 "${SPDX}" | sed -ne '/License Text/{s, *Y *License Text,,; s, *License Text,,; s,.* ,,;p}'`; do echo -e "${i}\t${i}\n" >> licenses_changes.txt if [[ ${i:-1} != '+' ]] ; then echo -e "${i}+\t${i}+\n" >> licenses_changes.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-0.6.2/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-0.6.1/spec_cleaner/__init__.py 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/spec_cleaner/__init__.py 2014-09-19 17:45:33.000000000 +0200 @@ -4,7 +4,7 @@ # All rights reserved. # See COPYING for details. -__version__ = '0.6.1' +__version__ = '0.6.2' import os import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/spec_cleaner/rpmbuild.py new/spec-cleaner-spec-cleaner-0.6.2/spec_cleaner/rpmbuild.py --- old/spec-cleaner-spec-cleaner-0.6.1/spec_cleaner/rpmbuild.py 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/spec_cleaner/rpmbuild.py 2014-09-19 17:45:33.000000000 +0200 @@ -11,7 +11,7 @@ def add(self, line): # if user uses cmake directly just recommend him using the macros - if line.startswith('cmake'): + if line.startswith('cmake') and not self.previous_line.startswith('# FIXME'): self.lines.append('# FIXME: you should use %%cmake macros') RpmCheck.add(self, line) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/spec_cleaner/rpmcheck.py new/spec-cleaner-spec-cleaner-0.6.2/spec_cleaner/rpmcheck.py --- old/spec-cleaner-spec-cleaner-0.6.1/spec_cleaner/rpmcheck.py 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/spec_cleaner/rpmcheck.py 2014-09-19 17:45:33.000000000 +0200 @@ -23,7 +23,7 @@ if line.find('%{?_smp_mflags}') == -1 and line.find('-j') == -1: # Don't append %_smp_mflags if the line ends with a backslash, # it would break the formatting - if not line.endswith('\\') and not '||' in line: - line = '{0} {1}'.format(line, '%{?_smp_mflags}') + if not line.endswith('\\'): + line = self.reg.re_make.sub(r'\1make %{?_smp_mflags}\3', line) Section.add(self, line) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/spec_cleaner/rpmcleaner.py new/spec-cleaner-spec-cleaner-0.6.2/spec_cleaner/rpmcleaner.py --- old/spec-cleaner-spec-cleaner-0.6.1/spec_cleaner/rpmcleaner.py 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/spec_cleaner/rpmcleaner.py 2014-09-19 17:45:33.000000000 +0200 @@ -1,6 +1,10 @@ # vim: set ts=4 sw=4 et: coding=UTF-8 -import io +try: + from StringIO import StringIO +except ImportError: + from io import StringIO + import sys import tempfile import subprocess @@ -69,12 +73,12 @@ if self.output: self.fout = open(self.output, 'w') elif self.inline: - fifo = io.BytesIO() + fifo = StringIO() while True: - bytes = self.fin.read(500 * 1024) - if len(bytes) == 0: + string = self.fin.read(500 * 1024) + if len(string) == 0: break - fifo.write(bytes) + fifo.write(string) self.fin.close() fifo.seek(0) @@ -143,9 +147,6 @@ # to maintain the specs all the same (eg somebody put # filelist to the top). for line in self.fin: - # Stop at the end of the file - if len(line) == 0: - break # Remove \n to make it easier to parse things line = line.rstrip('\n') line = line.rstrip('\r') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/spec_cleaner/rpminstall.py new/spec-cleaner-spec-cleaner-0.6.2/spec_cleaner/rpminstall.py --- old/spec-cleaner-spec-cleaner-0.6.1/spec_cleaner/rpminstall.py 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/spec_cleaner/rpminstall.py 2014-09-19 17:45:33.000000000 +0200 @@ -10,7 +10,8 @@ ''' def add(self, line): - install_command = 'make DESTDIR=%{buildroot} install %{?_smp_mflags}' + install_command = 'make DESTDIR=%{buildroot} install' + parallel_arg = ' %{?_smp_mflags}' line = self._complete_cleanup(line) line = self._replace_remove_la(line) @@ -22,10 +23,14 @@ # do not use install macros as we have trouble with it for now # we can convert it later on if self.reg.re_install.match(line): - line = install_command + # in case there is -j1 we need to ensure we are single threaded + if line.find('-j1') != -1: + line = install_command + ' -j1' + else: + line = install_command + parallel_arg # we can deal with additional params for %makeinstall so replace that too - line = line.replace('%{makeinstall}', install_command) + line = line.replace('%{makeinstall}', install_command + parallel_arg) Section.add(self, line) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-0.6.2/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-0.6.1/spec_cleaner/rpmregexp.py 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/spec_cleaner/rpmregexp.py 2014-09-19 17:45:33.000000000 +0200 @@ -73,6 +73,7 @@ # rpmbuild re_jobs = re.compile('%{(_smp_mflags|\?_smp_flags|\?jobs:\s*-j\s*%(jobs|{jobs}))}') + re_make = re.compile('(^|(.*\s)?)make($|(\s.*)?)') # rpmcopyright re_copyright = re.compile('^#\s*Copyright\ \(c\)\s*(.*)', re.IGNORECASE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/tests/acceptance-tests.py new/spec-cleaner-spec-cleaner-0.6.2/tests/acceptance-tests.py --- old/spec-cleaner-spec-cleaner-0.6.1/tests/acceptance-tests.py 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/tests/acceptance-tests.py 2014-09-19 17:45:33.000000000 +0200 @@ -8,6 +8,7 @@ import tempfile import difflib import datetime +import shutil from mock import patch from spec_cleaner import RpmSpecCleaner @@ -105,3 +106,19 @@ self._run_individual_test(tmp_file, self.tmp_file_rerun.name) with open(compare) as ref, open(self.tmp_file_rerun.name) as test: self.assertStreamEqual(ref, test) + + @patch('spec_cleaner.rpmcopyright.datetime') + def test_inline_function(self, datetime_mock): + datetime_mock.datetime.now.return_value = (datetime.datetime(2013, 1, 1)) + # grab first test ; copy it to tmp and then run inlining there + test = self._obtain_list_of_tests()[0] + infile = os.path.join(self.input_dir, test) + compare = os.path.join(self.fixtures_dir, test) + tmp_file = os.path.join(self.tmp_dir, test) + shutil.copyfile(infile, tmp_file) + + cleaner = RpmSpecCleaner(tmp_file, '', True, True, False, 'vimdiff') + cleaner.run() + + with open(compare) as ref, open(tmp_file) as test: + self.assertStreamEqual(ref, test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/tests/in/description.spec new/spec-cleaner-spec-cleaner-0.6.2/tests/in/description.spec --- old/spec-cleaner-spec-cleaner-0.6.1/tests/in/description.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.6.2/tests/in/description.spec 2014-09-19 17:45:33.000000000 +0200 @@ -0,0 +1,19 @@ +%description -n viewcvs +ViewCVS can browse directories, change logs, and do specific revisions +of files. It can display diffs between versions and show selections of +files based on tags or branches. In addition, ViewCVS has "annotation" +or "blame" support, Bonsai-like query facilities, template-based page +generation, and support for individually configurable virtual hosts. It +also includes support for CvsGraph -- a program to graphically display +the revision trees and branches. + + + +Authors: +-------- + The ViewCVS Group: + * Greg Stein + * Tanaka Akira + * Tim Cera + * Peter Funk + * Jay Painter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/tests/in/macros.spec new/spec-cleaner-spec-cleaner-0.6.2/tests/in/macros.spec --- old/spec-cleaner-spec-cleaner-0.6.1/tests/in/macros.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.6.2/tests/in/macros.spec 2014-09-19 17:45:33.000000000 +0200 @@ -0,0 +1,3 @@ +%build +cmake . \ + -DIHATECMAKE=OFF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/tests/in/makeinstall.spec new/spec-cleaner-spec-cleaner-0.6.2/tests/in/makeinstall.spec --- old/spec-cleaner-spec-cleaner-0.6.1/tests/in/makeinstall.spec 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/tests/in/makeinstall.spec 2014-09-19 17:45:33.000000000 +0200 @@ -3,6 +3,7 @@ %makeinstall %make_install make install DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} -j1 make DESTDIR=%{buildroot} -j4 install DESTDIR="%{buildroot}" make install make DESTDIR=%{buildroot} install %{?_smp_mflags} \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/tests/in/makeparams.spec new/spec-cleaner-spec-cleaner-0.6.2/tests/in/makeparams.spec --- old/spec-cleaner-spec-cleaner-0.6.1/tests/in/makeparams.spec 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/tests/in/makeparams.spec 2014-09-19 17:45:33.000000000 +0200 @@ -27,6 +27,7 @@ make %{_smp_mflags} make %{?_smp_mflags} make check ||: +make && mv mtr xmtr make %{?_smp_flags} VERBOSE=1 %install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/tests/out/check.spec new/spec-cleaner-spec-cleaner-0.6.2/tests/out/check.spec --- old/spec-cleaner-spec-cleaner-0.6.1/tests/out/check.spec 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/tests/out/check.spec 2014-09-19 17:45:33.000000000 +0200 @@ -17,7 +17,7 @@ %check -make V=1 check RUNTEST=true %{?_smp_mflags} +make %{?_smp_mflags} V=1 check RUNTEST=true make -j1 check -make test V=1 %{?_smp_mflags} +make %{?_smp_mflags} test V=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/tests/out/description.spec new/spec-cleaner-spec-cleaner-0.6.2/tests/out/description.spec --- old/spec-cleaner-spec-cleaner-0.6.1/tests/out/description.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.6.2/tests/out/description.spec 2014-09-19 17:45:33.000000000 +0200 @@ -0,0 +1,27 @@ +# +# spec file for package description +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%description -n viewcvs +ViewCVS can browse directories, change logs, and do specific revisions +of files. It can display diffs between versions and show selections of +files based on tags or branches. In addition, ViewCVS has "annotation" +or "blame" support, Bonsai-like query facilities, template-based page +generation, and support for individually configurable virtual hosts. It +also includes support for CvsGraph -- a program to graphically display +the revision trees and branches. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/tests/out/macros.spec new/spec-cleaner-spec-cleaner-0.6.2/tests/out/macros.spec --- old/spec-cleaner-spec-cleaner-0.6.1/tests/out/macros.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.6.2/tests/out/macros.spec 2014-09-19 17:45:33.000000000 +0200 @@ -0,0 +1,23 @@ +# +# spec file for package macros +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%build +# FIXME: you should use %%cmake macros +cmake . \ + -DIHATECMAKE=OFF + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/tests/out/makeinstall.spec new/spec-cleaner-spec-cleaner-0.6.2/tests/out/makeinstall.spec --- old/spec-cleaner-spec-cleaner-0.6.1/tests/out/makeinstall.spec 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/tests/out/makeinstall.spec 2014-09-19 17:45:33.000000000 +0200 @@ -20,6 +20,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} %make_install make DESTDIR=%{buildroot} install %{?_smp_mflags} +make DESTDIR=%{buildroot} install -j1 make DESTDIR=%{buildroot} install %{?_smp_mflags} make DESTDIR=%{buildroot} install %{?_smp_mflags} make DESTDIR=%{buildroot} install %{?_smp_mflags} \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.6.1/tests/out/makeparams.spec new/spec-cleaner-spec-cleaner-0.6.2/tests/out/makeparams.spec --- old/spec-cleaner-spec-cleaner-0.6.1/tests/out/makeparams.spec 2014-08-13 14:23:57.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.6.2/tests/out/makeparams.spec 2014-09-19 17:45:33.000000000 +0200 @@ -44,7 +44,8 @@ make %{?_smp_mflags} make %{?_smp_mflags} make %{?_smp_mflags} -make check ||: +make %{?_smp_mflags} check ||: +make %{?_smp_mflags} && mv mtr xmtr make %{?_smp_mflags} VERBOSE=1 %install -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
