Hello community, here is the log from the commit of package obs-service-format_spec_file for openSUSE:Factory checked in at 2017-11-16 13:57:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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" Thu Nov 16 13:57:50 2017 rev:71 rq:541730 version:20171107 Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-format_spec_file/obs-service-format_spec_file.changes 2017-02-08 10:50:51.384249882 +0100 +++ /work/SRC/openSUSE:Factory/.obs-service-format_spec_file.new/obs-service-format_spec_file.changes 2017-11-16 13:57:58.368238132 +0100 @@ -1,0 +2,8 @@ +Thu Nov 9 13:43:59 UTC 2017 - dimstar@opensuse.org + +- Update to version 20171107: + + Update licenses. + + SPDX conjunction / disjunction operators are capitalized. +- Rebase readd-exceptions.patch. + +------------------------------------------------------------------- Old: ---- obs-service-format_spec_file-20170204.tar.bz2 New: ---- obs-service-format_spec_file-20171107.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-format_spec_file.spec ++++++ --- /var/tmp/diff_new_pack.eMj8IK/_old 2017-11-16 13:57:59.928181612 +0100 +++ /var/tmp/diff_new_pack.eMj8IK/_new 2017-11-16 13:57:59.932181467 +0100 @@ -17,7 +17,7 @@ Name: obs-service-format_spec_file -Version: 20170204 +Version: 20171107 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 ++++++ debian.dsc ++++++ --- /var/tmp/diff_new_pack.eMj8IK/_old 2017-11-16 13:57:59.972180018 +0100 +++ /var/tmp/diff_new_pack.eMj8IK/_new 2017-11-16 13:57:59.976179873 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20170204 +Version: 20171107 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all ++++++ obs-service-format_spec_file-20170204.tar.bz2 -> obs-service-format_spec_file-20171107.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-format_spec_file-20170204/README.md new/obs-service-format_spec_file-20171107/README.md --- old/obs-service-format_spec_file-20170204/README.md 2017-02-04 07:50:36.000000000 +0100 +++ new/obs-service-format_spec_file-20171107/README.md 2017-11-07 10:40:36.000000000 +0100 @@ -386,6 +386,7 @@ |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| @@ -411,6 +412,7 @@ |SUSE-TGPPL-1.0| |SUSE-TeX| |SUSE-Ubuntu-Font-License-1.0| +|SUSE-XDebug| |SUSE-XFree86-with-font-exception| |SUSE-XSL-Lint| |SUSE-Xano| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-format_spec_file-20170204/licenses_changes.txt new/obs-service-format_spec_file-20171107/licenses_changes.txt --- old/obs-service-format_spec_file-20170204/licenses_changes.txt 2017-02-04 07:50:36.000000000 +0100 +++ new/obs-service-format_spec_file-20171107/licenses_changes.txt 2017-11-07 10:40:36.000000000 +0100 @@ -109,6 +109,7 @@ 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 https://opensource.org/licenses/BSDplusPatent BSD-3-Clause BSD (3-Clause) BSD-3-Clause BSD 3-Clause BSD-3-Clause BSD 3-clause (or similar) @@ -400,6 +401,7 @@ GPL-3.0+ GPL-3+ GPL-3.0+ GPL-3.0+ GPL-3.0+ GPLv3+ +GPL-3.0-with-Qt-Company-Qt-exception-1.1 GPL-3.0-with-Qt-Company-Qt-exception-1.1 Giftware Giftware Giftware+ Giftware+ Glide Glide @@ -476,6 +478,7 @@ LGPL-2.1+ LGPL-2.1+ LGPL-2.1+ LGPLv2+ LGPL-2.1+ LGPLv2.1+ +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 @@ -483,6 +486,7 @@ LGPL-3.0+ LGPL v3 or later LGPL-3.0+ LGPL-3.0+ LGPL-3.0+ LGPLv3+ +LGPL-3.0-with-Qt-Company-Qt-exception-1.1 LGPL-3.0-with-Qt-Company-Qt-exception-1.1 LGPLLR LGPLLR LGPLLR+ LGPLLR+ LPL-1.0 LPL-1.0 @@ -843,6 +847,8 @@ 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 +SUSE-MIT-Khronos+ SUSE-MIT-Khronos+ SUSE-Manpages Manpages licenses (linux man pages e.g.) SUSE-Manpages+ SUSE-Manpages+ SUSE-Matplotlib E.g. python -matplotlib -> LICENSE/LICENSE @@ -897,6 +903,8 @@ SUSE-TeX+ SUSE-TeX+ SUSE-Ubuntu-Font-License-1.0 http://font.ubuntu.com/licence/ SUSE-Ubuntu-Font-License-1.0+ SUSE-Ubuntu-Font-License-1.0+ +SUSE-XDebug https://xdebug.org/license.php +SUSE-XDebug+ SUSE-XDebug+ 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-format_spec_file-20170204/patch_license new/obs-service-format_spec_file-20171107/patch_license --- old/obs-service-format_spec_file-20170204/patch_license 2017-02-04 07:50:36.000000000 +0100 +++ new/obs-service-format_spec_file-20171107/patch_license 2017-11-07 10:40:36.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/) { $head = replace_spdx_and($head); $tail = replace_spdx_and($tail); $paren = replace_spdx_and($paren); @@ -191,8 +191,8 @@ } } - for (split(/(\s+(?:and|or)\s+)/, $license, -1)) { - $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:and|or)\s+)/; + for (split(/(\s+(?:AND|OR)\s+)/, $license, -1)) { + $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:AND|OR)\s+)/; s/\s+/ /g; push @licenses, $_; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-format_spec_file-20170204/prepare_spec new/obs-service-format_spec_file-20171107/prepare_spec --- old/obs-service-format_spec_file-20170204/prepare_spec 2017-02-04 07:50:36.000000000 +0100 +++ new/obs-service-format_spec_file-20171107/prepare_spec 2017-11-07 10:40:36.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/) { $head = replace_spdx_and($head); $tail = replace_spdx_and($tail); $paren = replace_spdx_and($paren); @@ -185,8 +185,8 @@ } } - for (split(/(\s+(?:and|or)\s+)/, $license, -1)) { - $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:and|or)\s+)/; + for (split(/(\s+(?:AND|OR)\s+)/, $license, -1)) { + $_ = replace_single_spdx($_) unless $_ eq '' || /(\s+(?:AND|OR)\s+)/; s/\s+/ /g; push @licenses, $_; } ++++++ readd-exceptions.patch ++++++ --- /var/tmp/diff_new_pack.eMj8IK/_old 2017-11-16 13:58:00.044177410 +0100 +++ /var/tmp/diff_new_pack.eMj8IK/_new 2017-11-16 13:58:00.048177265 +0100 @@ -1,7 +1,8 @@ -diff -ru obs-service-format_spec_file-20150716.orig/licenses_changes.txt obs-service-format_spec_file-20150716/licenses_changes.txt ---- obs-service-format_spec_file-20150716.orig/licenses_changes.txt 2015-07-16 19:41:55.000000000 +0200 -+++ obs-service-format_spec_file-20150716/licenses_changes.txt 2015-07-16 19:44:25.354282059 +0200 -@@ -370,6 +370,17 @@ +Index: obs-service-format_spec_file-20171107/licenses_changes.txt +=================================================================== +--- obs-service-format_spec_file-20171107.orig/licenses_changes.txt ++++ obs-service-format_spec_file-20171107/licenses_changes.txt +@@ -387,6 +387,17 @@ GPL-2.0+ GPL2+ GPL-2.0+ GPLv2 or later GPL-2.0+ GPLv2+ GPL-2.0+ libGeoIPUpdate is GPLv2 or later @@ -19,7 +20,7 @@ GPL-3.0 GNU GPL version 3 GPL-3.0 GNU General Public License version 3 (GPLv3) GPL-3.0 GPL 3 -@@ -384,6 +395,11 @@ +@@ -401,6 +412,11 @@ GPL-3.0+ GPL v3 or later GPL-3.0+ GPL-3+ GPL-3.0+ GPL-3.0+ GPL-3.0+ GPLv3+ @@ -28,7 +29,6 @@ +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-Qt-Company-Qt-exception-1.1 GPL-3.0-with-Qt-Company-Qt-exception-1.1 Giftware Giftware Giftware+ Giftware+ - Glide Glide -Only in obs-service-format_spec_file-20150716: licenses_changes.txt.orig