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+