diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index f509e1b..2656078 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -2,6 +2,7 @@ Thu Jul 16 17:42:20 UTC 2015 - coolo@suse.com - update licenses +- add readd-exceptions.patch to readd licenses we use ------------------------------------------------------------------- Tue Jun 23 14:09:06 UTC 2015 - hib@hiberis.nl diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index f5a559c..29ab6c4 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -25,6 +25,7 @@ Release: 0 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 @@ -41,6 +42,7 @@ spec file instead of creating a new one. %prep %setup +%patch0 -p1 %build diff --git a/readd-exceptions.patch b/readd-exceptions.patch new file mode 100644 index 0000000..08109d6 --- /dev/null +++ b/readd-exceptions.patch @@ -0,0 +1,34 @@ +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 @@ + 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 +@@ -384,6 +395,11 @@ + 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+ + Giftware Giftware + Giftware+ Giftware+ + Glide Glide +Only in obs-service-format_spec_file-20150716: licenses_changes.txt.orig