Accepting request 317201 from openSUSE:Tools

- update licenses
- add readd-exceptions.patch to readd licenses we use

- Fix build for Debian 7.0/8.0
- Use install target from Makefile

OBS-URL: https://build.opensuse.org/request/show/317201
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/obs-service-format_spec_file?expand=0&rev=65
This commit is contained in:
Stephan Kulow 2015-07-18 12:38:45 +00:00 committed by Git OBS Bridge
commit 52a0c682ed
6 changed files with 61 additions and 9 deletions

8
debian.dsc Normal file
View File

@ -0,0 +1,8 @@
Format: 1.0
Source: obs-service-format-spec-file
Version: 20150716
Binary: obs-service-format-spec-file
Maintainer: Adrian Schroeter <adrian@suse.de>
Architecture: all
Standards-Version: 3.9.6
Build-Depends: debhelper (>= 7)

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d70d9822aeb9db07e96895db3cadb7a44c073beacc1315fc8aa57b6a18acb2e
size 26377

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a28558fb55026de55a1e60d7f1a04e8f79aa60163f8bba002def0cb62c63da61
size 27608

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
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
- Fix build for Debian 7.0/8.0
- Use install target from Makefile
-------------------------------------------------------------------
Wed Jan 21 10:19:17 UTC 2015 - coolo@suse.com

View File

@ -20,11 +20,12 @@ 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: 20150716
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,15 +42,12 @@ spec file instead of creating a new one.
%prep
%setup
%patch0 -p1
%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

34
readd-exceptions.patch Normal file
View File

@ -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