From d435a29bd2fc3a601258ad274436043b57f12003354d126f286e2e1f705f7c9a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 14 Feb 2018 17:32:09 +0000 Subject: [PATCH 1/3] - adapt package list for SPDX 3.0 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=177 --- debian.dsc | 2 +- obs-service-format_spec_file-20171107.tar.bz2 | 3 --- obs-service-format_spec_file-20180214.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.spec | 6 +++--- 5 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 obs-service-format_spec_file-20171107.tar.bz2 create mode 100644 obs-service-format_spec_file-20180214.tar.bz2 diff --git a/debian.dsc b/debian.dsc index 1d79529..384142a 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20171107 +Version: 20180214 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20171107.tar.bz2 b/obs-service-format_spec_file-20171107.tar.bz2 deleted file mode 100644 index 7501109..0000000 --- a/obs-service-format_spec_file-20171107.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f876f3928881a407878fa53a94dbb29b837b2d0347863bd49d2d3303e02490c -size 29015 diff --git a/obs-service-format_spec_file-20180214.tar.bz2 b/obs-service-format_spec_file-20180214.tar.bz2 new file mode 100644 index 0000000..9fdefb0 --- /dev/null +++ b/obs-service-format_spec_file-20180214.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c3d7630dc05271ae7bcdb6b179032b0d373eea931730e050d9a1b0101cf2c7f +size 29406 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 1bc24a8..dd52a2a 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 14 17:30:08 UTC 2018 - coolo@suse.com + +- Update to version 20180214: + + adapt license list for SPDX 3.0 + ------------------------------------------------------------------- Thu Nov 9 13:43:59 UTC 2017 - dimstar@opensuse.org diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 5fe418b..e4c6bff 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -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,10 +17,10 @@ Name: obs-service-format_spec_file -Version: 20171107 +Version: 20180214 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 From 2f25a1b67fa0cf594343dcd99bed3f11426fddb9cb6f2d1c82261315fce643a7 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 14 Feb 2018 17:49:55 +0000 Subject: [PATCH 2/3] + remove readd-exceptions.patch OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=178 --- obs-service-format_spec_file.changes | 1 + obs-service-format_spec_file.spec | 3 --- readd-exceptions.patch | 34 ---------------------------- 3 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 readd-exceptions.patch diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index dd52a2a..6b913a3 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -3,6 +3,7 @@ Wed Feb 14 17:30:08 UTC 2018 - coolo@suse.com - Update to version 20180214: + adapt license list for SPDX 3.0 + + remove readd-exceptions.patch ------------------------------------------------------------------- Thu Nov 9 13:43:59 UTC 2017 - dimstar@opensuse.org diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index e4c6bff..782511e 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -25,9 +25,7 @@ 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 @@ spec file instead of creating a new one. %prep %setup -%patch0 -p1 %build diff --git a/readd-exceptions.patch b/readd-exceptions.patch deleted file mode 100644 index 17a00b0..0000000 --- a/readd-exceptions.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 -+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-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 -+GPL-2.0-with-bison-exception+ GPL-2.0-with-bison-exception+ -+GPL-2.0-with-classpath-exception GPL-2.0-with-classpath-exception -+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-3.0 GNU General Public License version 3 (GPLv3) - GPL-3.0 GPL 3 -@@ -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+ -+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-Qt-Company-Qt-exception-1.1 GPL-3.0-with-Qt-Company-Qt-exception-1.1 - Giftware Giftware - Giftware+ Giftware+ From f474a979247387655d2d7328b4f810090d42c1fefe6198a589a424004e412beb Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 15 Feb 2018 11:08:09 +0000 Subject: [PATCH 3/3] - Update to version 20180215: + map GPL-1.0 to GPL-1.0-only OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=179 --- debian.dsc | 2 +- obs-service-format_spec_file-20180214.tar.bz2 | 3 --- obs-service-format_spec_file-20180215.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.spec | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) delete mode 100644 obs-service-format_spec_file-20180214.tar.bz2 create mode 100644 obs-service-format_spec_file-20180215.tar.bz2 diff --git a/debian.dsc b/debian.dsc index 384142a..76b735c 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20180214 +Version: 20180215 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20180214.tar.bz2 b/obs-service-format_spec_file-20180214.tar.bz2 deleted file mode 100644 index 9fdefb0..0000000 --- a/obs-service-format_spec_file-20180214.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c3d7630dc05271ae7bcdb6b179032b0d373eea931730e050d9a1b0101cf2c7f -size 29406 diff --git a/obs-service-format_spec_file-20180215.tar.bz2 b/obs-service-format_spec_file-20180215.tar.bz2 new file mode 100644 index 0000000..2dc8c0e --- /dev/null +++ b/obs-service-format_spec_file-20180215.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5dbcddabdfc5b25946b851757ee2a716a33af1093efb2d52d825aca95766b902 +size 29430 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 6b913a3..8f42c3c 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 15 11:07:31 UTC 2018 - coolo@suse.com + +- Update to version 20180215: + + map GPL-1.0 to GPL-1.0-only + ------------------------------------------------------------------- Wed Feb 14 17:30:08 UTC 2018 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 782511e..f4019c6 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: 20180214 +Version: 20180215 Release: 0 Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0-only