From c7ce1e09db89ed48792e2f16825dbea179f86d7958000c5682dbab8f07dbbf42 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 14 Nov 2017 05:59:49 +0000 Subject: [PATCH] Accepting request 540225 from home:dimstar:branches:openSUSE:Tools - Update to version 20171107: + Update licenses. + SPDX conjunction / disjunction operators are capitalized. - Rebase readd-exceptions.patch. OBS-URL: https://build.opensuse.org/request/show/540225 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=175 --- debian.dsc | 2 +- obs-service-format_spec_file-20170204.tar.bz2 | 3 --- obs-service-format_spec_file-20171107.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 8 ++++++++ obs-service-format_spec_file.spec | 2 +- readd-exceptions.patch | 14 +++++++------- 6 files changed, 20 insertions(+), 12 deletions(-) delete mode 100644 obs-service-format_spec_file-20170204.tar.bz2 create mode 100644 obs-service-format_spec_file-20171107.tar.bz2 diff --git a/debian.dsc b/debian.dsc index 636ea75..1d79529 100644 --- a/debian.dsc +++ b/debian.dsc @@ -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 diff --git a/obs-service-format_spec_file-20170204.tar.bz2 b/obs-service-format_spec_file-20170204.tar.bz2 deleted file mode 100644 index 7faedb9..0000000 --- a/obs-service-format_spec_file-20170204.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8c3113b8938636d5eb977bf17f1488163f3ead47a2af1f34cad9ecfe52f0fff -size 28896 diff --git a/obs-service-format_spec_file-20171107.tar.bz2 b/obs-service-format_spec_file-20171107.tar.bz2 new file mode 100644 index 0000000..7501109 --- /dev/null +++ b/obs-service-format_spec_file-20171107.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f876f3928881a407878fa53a94dbb29b837b2d0347863bd49d2d3303e02490c +size 29015 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 77c81f0..1bc24a8 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Sat Feb 4 06:52:23 UTC 2017 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index edd8102..5fe418b 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -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 diff --git a/readd-exceptions.patch b/readd-exceptions.patch index 08109d6..17a00b0 100644 --- a/readd-exceptions.patch +++ b/readd-exceptions.patch @@ -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 @@ diff -ru obs-service-format_spec_file-20150716.orig/licenses_changes.txt obs-ser 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 @@ diff -ru obs-service-format_spec_file-20150716.orig/licenses_changes.txt obs-ser +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