From d3d558722429060a6fb084a3c60156d11a18178250c9b9d4ff35058d90b38352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 22 Jun 2015 11:14:02 +0000 Subject: [PATCH 1/5] debian fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=154 --- obs-service-format_spec_file-20150121.tar.bz2 | 3 --- obs-service-format_spec_file-20150622.tar.bz2 | 3 +++ obs-service-format_spec_file.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 obs-service-format_spec_file-20150121.tar.bz2 create mode 100644 obs-service-format_spec_file-20150622.tar.bz2 diff --git a/obs-service-format_spec_file-20150121.tar.bz2 b/obs-service-format_spec_file-20150121.tar.bz2 deleted file mode 100644 index 69f7582..0000000 --- a/obs-service-format_spec_file-20150121.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0d70d9822aeb9db07e96895db3cadb7a44c073beacc1315fc8aa57b6a18acb2e -size 26377 diff --git a/obs-service-format_spec_file-20150622.tar.bz2 b/obs-service-format_spec_file-20150622.tar.bz2 new file mode 100644 index 0000000..14cba1e --- /dev/null +++ b/obs-service-format_spec_file-20150622.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e1b323c5f2d5bfffe58a61ba10d2c64778fb0dc4aa5a8ee33f013438608ea3f +size 27367 diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 58d184c..963f7b9 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -20,7 +20,7 @@ Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 Group: Development/Tools/Building -Version: 20150121 +Version: 20150622 Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr From 91dea8be5f7212eedd59460c7fba18f550deba9fbf6e83eea3f488ddce91de31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 22 Jun 2015 11:30:37 +0000 Subject: [PATCH 2/5] add debian dsc file OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=155 --- debian.dsc | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 debian.dsc diff --git a/debian.dsc b/debian.dsc new file mode 100644 index 0000000..17b9052 --- /dev/null +++ b/debian.dsc @@ -0,0 +1,8 @@ +Format: 1.0 +Source: obs-service-format_spec_file +Version: 20150622 +Binary: obs-service-format_spec_file +Maintainer: Adrian Schroeter +Architecture: all +Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 7) From d98e21a18d5b474e558c4ee2226b871b07de48a5a0849680cfb34f42c7f80940 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Tue, 23 Jun 2015 14:17:58 +0000 Subject: [PATCH 3/5] Accepting request 313290 from home:hiberis:branches:openSUSE:Tools OBS-URL: https://build.opensuse.org/request/show/313290 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=156 --- debian.dsc | 6 +++--- obs-service-format_spec_file.changes | 6 ++++++ obs-service-format_spec_file.spec | 6 +----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debian.dsc b/debian.dsc index 17b9052..fb973cb 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,8 +1,8 @@ Format: 1.0 -Source: obs-service-format_spec_file +Source: obs-service-format-spec-file Version: 20150622 -Binary: obs-service-format_spec_file +Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all -Standards-Version: 3.7.2 +Standards-Version: 3.9.6 Build-Depends: debhelper (>= 7) diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 2932362..522ff0d 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 23 14:09:06 UTC 2015 - hib@hiberis.nl + +- Fix build for Debian 7.0/8.0 +- Use install target from Makefile + ------------------------------------------------------------------- Wed Jan 21 10:19:17 UTC 2015 - coolo@suse.com diff --git a/obs-service-format_spec_file.spec b/obs-service-format_spec_file.spec index 963f7b9..3bb4cac 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -45,11 +45,7 @@ spec file instead of creating a new one. %build %install -mkdir -p $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files -install -m 0755 format_spec_file $RPM_BUILD_ROOT/usr/lib/obs/service -install -m 0644 format_spec_file.service $RPM_BUILD_ROOT/usr/lib/obs/service -install -m 0755 prepare_spec patch_license $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files -install -m 0644 licenses_changes.txt $RPM_BUILD_ROOT/usr/lib/obs/service/format_spec_file.files +%makeinstall %check perl prepare_spec %_topdir/SOURCES/%name.spec From e0f2f29ff819897197c669c7e4f7c3aca552a0ac6a39934c06abb7e8cd172690 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 16 Jul 2015 17:42:28 +0000 Subject: [PATCH 4/5] - update licenses OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=157 --- debian.dsc | 2 +- obs-service-format_spec_file-20150622.tar.bz2 | 3 --- obs-service-format_spec_file-20150716.tar.bz2 | 3 +++ obs-service-format_spec_file.changes | 5 +++++ obs-service-format_spec_file.spec | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 obs-service-format_spec_file-20150622.tar.bz2 create mode 100644 obs-service-format_spec_file-20150716.tar.bz2 diff --git a/debian.dsc b/debian.dsc index fb973cb..446375d 100644 --- a/debian.dsc +++ b/debian.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-format-spec-file -Version: 20150622 +Version: 20150716 Binary: obs-service-format-spec-file Maintainer: Adrian Schroeter Architecture: all diff --git a/obs-service-format_spec_file-20150622.tar.bz2 b/obs-service-format_spec_file-20150622.tar.bz2 deleted file mode 100644 index 14cba1e..0000000 --- a/obs-service-format_spec_file-20150622.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e1b323c5f2d5bfffe58a61ba10d2c64778fb0dc4aa5a8ee33f013438608ea3f -size 27367 diff --git a/obs-service-format_spec_file-20150716.tar.bz2 b/obs-service-format_spec_file-20150716.tar.bz2 new file mode 100644 index 0000000..9755100 --- /dev/null +++ b/obs-service-format_spec_file-20150716.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a28558fb55026de55a1e60d7f1a04e8f79aa60163f8bba002def0cb62c63da61 +size 27608 diff --git a/obs-service-format_spec_file.changes b/obs-service-format_spec_file.changes index 522ff0d..f509e1b 100644 --- a/obs-service-format_spec_file.changes +++ b/obs-service-format_spec_file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 16 17:42:20 UTC 2015 - coolo@suse.com + +- update licenses + ------------------------------------------------------------------- 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 3bb4cac..f5a559c 100644 --- a/obs-service-format_spec_file.spec +++ b/obs-service-format_spec_file.spec @@ -20,7 +20,7 @@ Name: obs-service-format_spec_file Summary: An OBS source service: reformats a spec file to SUSE standard License: GPL-2.0 Group: Development/Tools/Building -Version: 20150622 +Version: 20150716 Release: 0 Url: https://github.com/openSUSE/obs-service-format_spec_file # osc service dr From 8539b7fd61b142fe0d8f2dd464789b95e02cc94889619a495a0603d4fb8b80ab Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 16 Jul 2015 17:45:33 +0000 Subject: [PATCH 5/5] - add readd-exceptions.patch to readd licenses we use OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-format_spec_file?expand=0&rev=158 --- obs-service-format_spec_file.changes | 1 + obs-service-format_spec_file.spec | 2 ++ readd-exceptions.patch | 34 ++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 readd-exceptions.patch 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