Hello community,
here is the log from the commit of package obs-service-format_spec_file for
openSUSE:Factory checked in at 2016-09-05 21:13:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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"
Changes:
--------
---
/work/SRC/openSUSE:Factory/obs-service-format_spec_file/obs-service-format_spec_file.changes
2016-02-07 09:21:28.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.obs-service-format_spec_file.new/obs-service-format_spec_file.changes
2016-09-05 21:13:44.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Aug 24 12:21:29 UTC 2016 - [email protected]
+
+- Update to 20160406
+ * Update licenses
+ * Fetch SPDX license exceptions (bsc#973404)
+
+-------------------------------------------------------------------
Old:
----
obs-service-format_spec_file-20160202.tar.bz2
New:
----
obs-service-format_spec_file-20160406.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-service-format_spec_file.spec ++++++
--- /var/tmp/diff_new_pack.NWZ3Fc/_old 2016-09-05 21:13:45.000000000 +0200
+++ /var/tmp/diff_new_pack.NWZ3Fc/_new 2016-09-05 21:13:45.000000000 +0200
@@ -17,11 +17,11 @@
Name: obs-service-format_spec_file
+Version: 20160406
+Release: 0
Summary: An OBS source service: reformats a spec file to SUSE standard
License: GPL-2.0
Group: Development/Tools/Building
-Version: 20160202
-Release: 0
Url: https://github.com/openSUSE/obs-service-format_spec_file
# osc service dr
Source: %{name}-%{version}.tar.bz2
@@ -55,7 +55,7 @@
%files
%defattr(-,root,root)
%doc COPYING
-%dir /usr/lib/obs
-/usr/lib/obs/service
+%dir %{_prefix}/lib/obs
+%{_prefix}/lib/obs/service
%changelog
++++++ _service ++++++
--- /var/tmp/diff_new_pack.NWZ3Fc/_old 2016-09-05 21:13:45.000000000 +0200
+++ /var/tmp/diff_new_pack.NWZ3Fc/_new 2016-09-05 21:13:45.000000000 +0200
@@ -1,6 +1,6 @@
<services>
<service name="tar_scm" mode="disabled">
- <param
name="url">[email protected]:openSUSE/obs-service-format_spec_file.git</param>
+ <param
name="url">https://github.com/openSUSE/obs-service-format_spec_file.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
<param name="version">git-master</param>
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.NWZ3Fc/_old 2016-09-05 21:13:45.000000000 +0200
+++ /var/tmp/diff_new_pack.NWZ3Fc/_new 2016-09-05 21:13:45.000000000 +0200
@@ -1,6 +1,6 @@
Format: 1.0
Source: obs-service-format-spec-file
-Version: 20160202
+Version: 20160406
Binary: obs-service-format-spec-file
Maintainer: Adrian Schroeter <[email protected]>
Architecture: all
++++++ obs-service-format_spec_file-20160202.tar.bz2 ->
obs-service-format_spec_file-20160406.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-format_spec_file-20160202/Makefile
new/obs-service-format_spec_file-20160406/Makefile
--- old/obs-service-format_spec_file-20160202/Makefile 2016-02-02
11:32:49.000000000 +0100
+++ new/obs-service-format_spec_file-20160406/Makefile 2016-04-06
21:17:32.000000000 +0200
@@ -11,5 +11,6 @@
install -d $(DESTDIR)$(servicedir)/format_spec_file.files
install -m 0755 prepare_spec patch_license
$(DESTDIR)$(servicedir)/format_spec_file.files
install -m 0644 licenses_changes.txt
$(DESTDIR)$(servicedir)/format_spec_file.files
+ install -m 0644 licences_exceptions.txt
$(DESTDIR)$(servicedir)/format_spec_file.files
.PHONY: all install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-format_spec_file-20160202/README.md
new/obs-service-format_spec_file-20160406/README.md
--- old/obs-service-format_spec_file-20160202/README.md 2016-02-02
11:32:49.000000000 +0100
+++ new/obs-service-format_spec_file-20160406/README.md 2016-04-06
21:17:32.000000000 +0200
@@ -136,6 +136,7 @@
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)
Giftware | Giftware License
@@ -181,6 +182,11 @@
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
LPL-1.0 | Lucent Public License Version 1.0
MakeIndex | MakeIndex License
@@ -210,6 +216,7 @@
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
@@ -243,6 +250,7 @@
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
PHP-3.0 | PHP License v3.0
PHP-3.01 | PHP License v3.01
Plexus | Plexus Classworlds License
@@ -264,6 +272,7 @@
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-format_spec_file-20160202/fetch-licenses.sh
new/obs-service-format_spec_file-20160406/fetch-licenses.sh
--- old/obs-service-format_spec_file-20160202/fetch-licenses.sh 2016-02-02
11:32:49.000000000 +0100
+++ new/obs-service-format_spec_file-20160406/fetch-licenses.sh 2016-04-06
21:17:32.000000000 +0200
@@ -55,6 +55,13 @@
rm licenses_changes.raw
) > README.md
+for i in `w3m -dump -cols 1000 http://spdx.org/licenses/exceptions-index.html
| grep "License Exception Text" | sed -e 's, *Y *License Exception Text,,; s,
*License Exception Text,,; s,\s* \([^ ]*\)$,:\1,' | cut -d: -f2`; do
+ echo "$i" >> license_exceptions.ntxt ;
+done
+
+cat license_exceptions.ntxt | sort -u -o licences_exceptions.txt
+rm license_exceptions.ntxt
+
cat licenses_changes.ntxt licenses_changes.ptxt | sort -u -o
licenses_changes.stxt
( echo "First line" ; cat licenses_changes.stxt ) > licenses_changes.txt
rm licenses_changes.ntxt licenses_changes.stxt licenses_changes.ptxt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-format_spec_file-20160202/format_spec_file
new/obs-service-format_spec_file-20160406/format_spec_file
--- old/obs-service-format_spec_file-20160202/format_spec_file 2016-02-02
11:32:49.000000000 +0100
+++ new/obs-service-format_spec_file-20160406/format_spec_file 2016-04-06
21:17:32.000000000 +0200
@@ -31,6 +31,11 @@
echo "WARNING: no spec file found"
exit 0
fi
+ if [ "$i" != "${i##*/}" ]; then
+ # no path separators, please ("security" issue)
+ echo "$i: illegal filename"
+ exit 1
+ fi
if /usr/lib/obs/service/format_spec_file.files/prepare_spec "$i" >
"$MYOUTDIR/$i.$$"; then
# remove all file files which are indendical to committed files
# be carefull for the case that $MYOUDIR is local dir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-format_spec_file-20160202/licences_exceptions.txt
new/obs-service-format_spec_file-20160406/licences_exceptions.txt
--- old/obs-service-format_spec_file-20160202/licences_exceptions.txt
1970-01-01 01:00:00.000000000 +0100
+++ new/obs-service-format_spec_file-20160406/licences_exceptions.txt
2016-04-06 21:17:32.000000000 +0200
@@ -0,0 +1,25 @@
+389-exception
+Autoconf-exception-2.0
+Autoconf-exception-3.0
+Bison-exception-2.2
+CLISP-exception-2.0
+Classpath-exception-2.0
+DigiRule-FOSS-exception
+FLTK-exception
+Fawkes-Runtime-exception
+Font-exception-2.0
+GCC-exception-2.0
+GCC-exception-3.1
+LZMA-exception
+Libtool-exception
+Nokia-Qt-exception-1.1
+OCCT-exception-1.0
+Qwt-exception-1.0
+WxWindows-exception-3.1
+eCos-exception-2.0
+freertos-exception-2.0
+gnu-javamail-exception
+i2p-gpl-java-exception
+mif-exception
+openvpn-openssl-exception
+u-boot-exception-2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/obs-service-format_spec_file-20160202/licenses_changes.txt
new/obs-service-format_spec_file-20160406/licenses_changes.txt
--- old/obs-service-format_spec_file-20160202/licenses_changes.txt
2016-02-02 11:32:49.000000000 +0100
+++ new/obs-service-format_spec_file-20160406/licenses_changes.txt
2016-04-06 21:17:32.000000000 +0200
@@ -310,6 +310,8 @@
ErlPL-1.1+ ErlPL-1.1+
Eurosym Eurosym
Eurosym+ Eurosym+
+FSFAP FSFAP
+FSFAP+ FSFAP+
FSFUL FSFUL
FSFUL+ FSFUL+
FSFULLR FSFULLR
@@ -435,6 +437,10 @@
JSON+ JSON+
JasPer-2.0 JasPer-2.0
JasPer-2.0+ JasPer-2.0+
+LAL-1.2 LAL-1.2
+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
@@ -490,6 +496,12 @@
Latex2e+ Latex2e+
Leptonica Leptonica
Leptonica+ Leptonica+
+LiLiQ-P-1.1 LiLiQ-P-1.1
+LiLiQ-P-1.1+ LiLiQ-P-1.1+
+LiLiQ-R-1.1 LiLiQ-R-1.1
+LiLiQ-R-1.1+ LiLiQ-R-1.1+
+LiLiQ-Rplus-1.1 LiLiQ-Rplus-1.1
+LiLiQ-Rplus-1.1+ LiLiQ-Rplus-1.1+
Libpng Libpng
Libpng+ Libpng+
MIT Expat
@@ -553,6 +565,8 @@
NCSA+ NCSA+
NGPL NGPL
NGPL+ NGPL+
+NLOD-1.0 NLOD-1.0
+NLOD-1.0+ NLOD-1.0+
NLPL NLPL
NLPL+ NLPL+
NOSL NOSL
@@ -635,6 +649,8 @@
OPL-1.0 OPL-1.0
OPL-1.0 Open Public License 1.0
OPL-1.0+ OPL-1.0+
+OSET-PL-2.1 OSET-PL-2.1
+OSET-PL-2.1+ OSET-PL-2.1+
OSL-1.0 OSL-1.0
OSL-1.0+ OSL-1.0+
OSL-1.1 OSL-1.1
@@ -711,6 +727,8 @@
SISSL-1.2+ SISSL-1.2+
SMLNJ SMLNJ
SMLNJ+ SMLNJ+
+SMPPL SMPPL
+SMPPL+ SMPPL+
SNIA SNIA
SNIA+ SNIA+
SPL-1.0 SPL-1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-format_spec_file-20160202/patch_license
new/obs-service-format_spec_file-20160406/patch_license
--- old/obs-service-format_spec_file-20160202/patch_license 2016-02-02
11:32:49.000000000 +0100
+++ new/obs-service-format_spec_file-20160406/patch_license 2016-04-06
21:17:32.000000000 +0200
@@ -243,7 +243,7 @@
$ifhandler->{"disabled"} = 0;
my @readspec;
- open ( SPEC , "$specfile" ) || die "can't read specfile";
+ open ( SPEC , '<', "$specfile" ) || die "can't read specfile";
@readspec = <SPEC>;
close SPEC;
chomp @readspec;
@@ -551,7 +551,7 @@
}
my $xdefinelist;
my $seen_name = 0;
-open ( SPE , "$specfile" );
+open ( SPE , '<', "$specfile" );
while ( <SPE> ) {
chomp;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/obs-service-format_spec_file-20160202/prepare_spec
new/obs-service-format_spec_file-20160406/prepare_spec
--- old/obs-service-format_spec_file-20160202/prepare_spec 2016-02-02
11:32:49.000000000 +0100
+++ new/obs-service-format_spec_file-20160406/prepare_spec 2016-04-06
21:17:32.000000000 +0200
@@ -247,7 +247,7 @@
$ifhandler->{"disabled"} = 0;
my @readspec;
- open ( SPEC , "$specfile" ) || die "can't read specfile";
+ open ( SPEC , '<', "$specfile" ) || die "can't read specfile";
@readspec = <SPEC>;
close SPEC;
chomp @readspec;
@@ -576,7 +576,7 @@
my $xdefinelist;
my $seen_name = 0;
-open ( SPE , "$specfile" );
+open ( SPE , '<', "$specfile" ) || die("open $specfile: $!\n");
while ( <SPE> ) {
chomp();
if ( /^%define/ ) {
