From aa39acf86260f477bb6046f4b3c9ae0c911707ddc5cb695efacb2969150b0e78 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Mon, 1 Aug 2016 09:32:05 +0000 Subject: [PATCH] Accepting request 411715 from home:tbechtold:branches:devel:languages:ruby - add 0001-Also-tag-APACHE-LICENSE-2.0-as-docfile.patch OBS-URL: https://build.opensuse.org/request/show/411715 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/rubygem-gem2rpm?expand=0&rev=18 --- ...so-tag-APACHE-LICENSE-2.0-as-docfile.patch | 26 +++++++++++++++++++ rubygem-gem2rpm.changes | 5 ++++ rubygem-gem2rpm.spec | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 0001-Also-tag-APACHE-LICENSE-2.0-as-docfile.patch diff --git a/0001-Also-tag-APACHE-LICENSE-2.0-as-docfile.patch b/0001-Also-tag-APACHE-LICENSE-2.0-as-docfile.patch new file mode 100644 index 0000000..93ce7f4 --- /dev/null +++ b/0001-Also-tag-APACHE-LICENSE-2.0-as-docfile.patch @@ -0,0 +1,26 @@ +From ee81c7f09669db9e6898df5bf36ac6c102d0d615 Mon Sep 17 00:00:00 2001 +From: Thomas Bechtold +Date: Mon, 18 Jul 2016 10:12:29 +0200 +Subject: [PATCH] Also tag APACHE-LICENSE-2.0 as docfile + +Some packages (e.g. rubygem-apipie-rails) name it that way +--- + templates/opensuse.spec.erb | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/templates/opensuse.spec.erb b/templates/opensuse.spec.erb +index 22c4647..5b62b26 100644 +--- a/templates/opensuse.spec.erb ++++ b/templates/opensuse.spec.erb +@@ -118,6 +118,8 @@ PreReq: update-alternatives + license + license-mit + mit-license ++ apache-license-2.0 ++ license-apache-2.0 + changelog + news + release_notes +-- +2.9.0 + diff --git a/rubygem-gem2rpm.changes b/rubygem-gem2rpm.changes index a87f734..ec849e2 100644 --- a/rubygem-gem2rpm.changes +++ b/rubygem-gem2rpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 18 08:29:08 UTC 2016 - tbechtold@suse.com + +- add 0001-Also-tag-APACHE-LICENSE-2.0-as-docfile.patch + ------------------------------------------------------------------- Wed Apr 6 06:54:21 UTC 2016 - coolo@suse.com diff --git a/rubygem-gem2rpm.spec b/rubygem-gem2rpm.spec index 5d54554..e59994e 100644 --- a/rubygem-gem2rpm.spec +++ b/rubygem-gem2rpm.spec @@ -64,6 +64,7 @@ Patch13: 0015-Add-licence-to-the-list-of-license-files-as-well.patch Patch14: 0016-add-two-more-ways-to-express-changes.patch Patch15: 0009-No-longer-require-the-ruby-version-inside-the-subpac.patch Patch16: 0017-touch-unpacked-sources.patch +Patch17: 0001-Also-tag-APACHE-LICENSE-2.0-as-docfile.patch Summary: Generate rpm specfiles from gems License: GPL-2.0+ Group: Development/Languages/Ruby @@ -92,6 +93,7 @@ The spec file tries to follow the gem as closely as possible %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 %build %gem_build