pool/rubygem-gem2rpm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- more patches from git:

Browse Source 
A    0010-Try-to-load-rbconfigpackagingsupport-and-fail-gracef.patch
A    0011-Add-support-for-scripts-pre-post-for-subpackages.patch
A    0012-typo-in-gem2rpm.yml.documentation-custom_pkgs-instea.patch
A    0013-Also-tag-LICENSE-MIT-as-docfile.patch
A    0014-Refactor-into-multiple-lines.patch
A    0015-Add-licence-to-the-list-of-license-files-as-well.patch
A    0016-add-two-more-ways-to-express-changes.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/rubygem-gem2rpm?expand=0&rev=10
This commit is contained in:
Stephan Kulow 2015-02-11 01:24:05 +00:00 committed by Git OBS Bridge
parent 3240fc8261
commit 4005ce317e
9 changed files with 305 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0010-Try-to-load-rbconfigpackagingsupport-and-fail-gracef.patch Normal file
View File

@ -0,0 +1,28 @@
From 953ff66677490c78ceff14afc0365f832079333a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
Date: Tue, 21 Oct 2014 17:55:23 +0200
Subject: [PATCH 10/16] Try to load rbconfigpackagingsupport and fail
gracefully if not available
The file will patch ruby_install_name on unversioned ruby installations.
---
templates/gem_packages.spec.erb | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/templates/gem_packages.spec.erb b/templates/gem_packages.spec.erb
index 29873e5..a6ab58b 100644
--- a/templates/gem_packages.spec.erb
+++ b/templates/gem_packages.spec.erb
@@ -1,4 +1,9 @@
<%
+
+ begin
+ require 'rbconfigpackagingsupport'
+ rescue LoadError => ex
+ end
def self.patch_mod_full_name(path, mod_full_name)
path.gsub(/\/-/, "/#{mod_full_name}")
end
--
2.2.2

44
0011-Add-support-for-scripts-pre-post-for-subpackages.patch Normal file
View File

@ -0,0 +1,44 @@
From 0ee368bc6c4ea35d233dadbe1f2c7048a99d3dc4 Mon Sep 17 00:00:00 2001
From: Theo chatzimichos <tampakrap@opensuse.org>
Date: Fri, 5 Dec 2014 17:11:47 +0200
Subject: [PATCH 11/16] Add support for :scripts: (pre/post) for subpackages
With this commit we can add pre/post/(etc) scripts in gem2rpm.yml for
subpackages, as in the example below:
:custom_pkgs:
apache:
:scripts:
:pre: |-
some_command
:post:
another_command
---
templates/opensuse.spec.erb | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/templates/opensuse.spec.erb b/templates/opensuse.spec.erb
index 8bc281c..af04eaf 100644
--- a/templates/opensuse.spec.erb
+++ b/templates/opensuse.spec.erb
@@ -209,6 +209,17 @@ This package holds the <%= custom_pkg_name %> sub package for <%= spec.name -%>
%defattr(-,root,root,-)
<%= data[:filelist] %>
+<% if data[:scripts]
+ if data[:scripts].is_a? Hash
+ data[:scripts].each do |section, content| -%>
+%<%=section %> <%=custom_pkg_name %>
+<%= content %>
+
+<% end
+ end
+ end
+-%>
+
<% end
end
-%>
--
2.2.2

26
0012-typo-in-gem2rpm.yml.documentation-custom_pkgs-instea.patch Normal file
View File

@ -0,0 +1,26 @@
From 092f7ca4ff1f954dd8982acf7199cd15636e87f3 Mon Sep 17 00:00:00 2001
From: Theo Chatzimichos <tampakrap@opensuse.org>
Date: Fri, 5 Dec 2014 17:16:41 +0200
Subject: [PATCH 12/16] typo in gem2rpm.yml.documentation: :custom_pkgs:
instead of :custom:
---
gem2rpm.yml.documentation | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gem2rpm.yml.documentation b/gem2rpm.yml.documentation
index 5e444eb..376eacd 100644
--- a/gem2rpm.yml.documentation
+++ b/gem2rpm.yml.documentation
@@ -54,7 +54,7 @@
# :filelist: |-
# /usr/bin/gem2rpm-opensuse
# ## used by gem_packages
-# :custom:
+# :custom_pkgs:
# apache:
# :preamble: |-
# Requires: .....
--
2.2.2

40
0013-Also-tag-LICENSE-MIT-as-docfile.patch Normal file
View File

@ -0,0 +1,40 @@
From dad615aa35cbbe0d7351ea66af44a8548853a2da Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 12 Jan 2015 15:34:26 +0100
Subject: [PATCH 13/16] Also tag LICENSE-MIT as docfile
Some packages (e.g. rubygem-http_parser) name it that way
---
templates/gem_packages.spec.erb | 2 +-
templates/opensuse.spec.erb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/gem_packages.spec.erb b/templates/gem_packages.spec.erb
index a6ab58b..15500a0 100644
--- a/templates/gem_packages.spec.erb
+++ b/templates/gem_packages.spec.erb
@@ -120,7 +120,7 @@ Usually in RDoc and RI formats.
%w(test spec).each { |framework|
test_frameworks[framework] = 1 if path.index(framework + "/") == 0
}
- %w(changes copying history legal license mit-license changelog readme).each { |file|
+ %w(changes copying history legal license license-mit mit-license changelog readme).each { |file|
bpath = path.downcase.gsub(%r{\.rdoc$}, '').gsub(%r{\.txt$}, '').gsub(%r{\.md$}, '')
#$stderr.puts "PATH #{path} #{bpath} #{file}"
docdirfiles << path if bpath == file
diff --git a/templates/opensuse.spec.erb b/templates/opensuse.spec.erb
index af04eaf..8eb7fee 100644
--- a/templates/opensuse.spec.erb
+++ b/templates/opensuse.spec.erb
@@ -110,7 +110,7 @@ PreReq: update-alternatives
%w(test spec).each { |framework|
test_frameworks[framework] = 1 if path.index(framework + "/") == 0
}
- %w(changes copying history legal license mit-license changelog readme).each { |file|
+ %w(changes copying history legal license license-mit mit-license changelog readme).each { |file|
bpath = path.downcase.gsub(%r{\.rdoc$}, '').gsub(%r{\.txt$}, '').gsub(%r{\.md$}, '')
#$stderr.puts "PATH #{path} #{bpath} #{file}"
docdirfiles << path if bpath == file
--
2.2.2

58
0014-Refactor-into-multiple-lines.patch Normal file
View File

@ -0,0 +1,58 @@
From 5bb494a7d6911754e485f6b729861771181bf2a0 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 12 Jan 2015 15:51:08 +0100
Subject: [PATCH 14/16] Refactor into multiple lines
Makes this easier to extend/read imho.
---
templates/gem_packages.spec.erb | 11 ++++++++++-
templates/opensuse.spec.erb | 11 ++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/templates/gem_packages.spec.erb b/templates/gem_packages.spec.erb
index 15500a0..d3a43fd 100644
--- a/templates/gem_packages.spec.erb
+++ b/templates/gem_packages.spec.erb
@@ -120,7 +120,16 @@ Usually in RDoc and RI formats.
%w(test spec).each { |framework|
test_frameworks[framework] = 1 if path.index(framework + "/") == 0
}
- %w(changes copying history legal license license-mit mit-license changelog readme).each { |file|
+ %w(changes
+ copying
+ history
+ legal
+ license
+ license-mit
+ mit-license
+ changelog
+ readme
+ ).each { |file|
bpath = path.downcase.gsub(%r{\.rdoc$}, '').gsub(%r{\.txt$}, '').gsub(%r{\.md$}, '')
#$stderr.puts "PATH #{path} #{bpath} #{file}"
docdirfiles << path if bpath == file
diff --git a/templates/opensuse.spec.erb b/templates/opensuse.spec.erb
index 8eb7fee..88e7356 100644
--- a/templates/opensuse.spec.erb
+++ b/templates/opensuse.spec.erb
@@ -110,7 +110,16 @@ PreReq: update-alternatives
%w(test spec).each { |framework|
test_frameworks[framework] = 1 if path.index(framework + "/") == 0
}
- %w(changes copying history legal license license-mit mit-license changelog readme).each { |file|
+ %w(changes
+ copying
+ history
+ legal
+ license
+ license-mit
+ mit-license
+ changelog
+ readme
+ ).each { |file|
bpath = path.downcase.gsub(%r{\.rdoc$}, '').gsub(%r{\.txt$}, '').gsub(%r{\.md$}, '')
#$stderr.puts "PATH #{path} #{bpath} #{file}"
docdirfiles << path if bpath == file
--
2.2.2

38
0015-Add-licence-to-the-list-of-license-files-as-well.patch Normal file
View File

@ -0,0 +1,38 @@
From b10341f5c13d71271e195101e46213026f628048 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 12 Jan 2015 15:52:34 +0100
Subject: [PATCH 15/16] Add 'licence' to the list of license files as well
This is a misspelling, but seems to be common enough still
---
templates/gem_packages.spec.erb | 1 +
templates/opensuse.spec.erb | 1 +
2 files changed, 2 insertions(+)
diff --git a/templates/gem_packages.spec.erb b/templates/gem_packages.spec.erb
index d3a43fd..b772d02 100644
--- a/templates/gem_packages.spec.erb
+++ b/templates/gem_packages.spec.erb
@@ -124,6 +124,7 @@ Usually in RDoc and RI formats.
copying
history
legal
+ licence
license
license-mit
mit-license
diff --git a/templates/opensuse.spec.erb b/templates/opensuse.spec.erb
index 88e7356..8d14e38 100644
--- a/templates/opensuse.spec.erb
+++ b/templates/opensuse.spec.erb
@@ -114,6 +114,7 @@ PreReq: update-alternatives
copying
history
legal
+ licence
license
license-mit
mit-license
--
2.2.2

39
0016-add-two-more-ways-to-express-changes.patch Normal file
View File

@ -0,0 +1,39 @@
From 814a7133ce8ab7271cf0bf31ad6d4de94fec8863 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.de>
Date: Wed, 11 Feb 2015 02:05:31 +0100
Subject: [PATCH 16/16] add two more ways to express changes
---
templates/gem_packages.spec.erb | 2 ++
templates/opensuse.spec.erb | 2 ++
2 files changed, 4 insertions(+)
diff --git a/templates/gem_packages.spec.erb b/templates/gem_packages.spec.erb
index b772d02..0cd92e2 100644
--- a/templates/gem_packages.spec.erb
+++ b/templates/gem_packages.spec.erb
@@ -129,6 +129,8 @@ Usually in RDoc and RI formats.
license-mit
mit-license
changelog
+ news
+ release_notes
readme
).each { |file|
bpath = path.downcase.gsub(%r{\.rdoc$}, '').gsub(%r{\.txt$}, '').gsub(%r{\.md$}, '')
diff --git a/templates/opensuse.spec.erb b/templates/opensuse.spec.erb
index 8d14e38..b1251c5 100644
--- a/templates/opensuse.spec.erb
+++ b/templates/opensuse.spec.erb
@@ -119,6 +119,8 @@ PreReq: update-alternatives
license-mit
mit-license
changelog
+ news
+ release_notes
readme
).each { |file|
bpath = path.downcase.gsub(%r{\.rdoc$}, '').gsub(%r{\.txt$}, '').gsub(%r{\.md$}, '')
--
2.2.2

12
rubygem-gem2rpm.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Wed Feb 11 01:23:45 UTC 2015 - coolo@suse.com
- more patches from git:
A 0010-Try-to-load-rbconfigpackagingsupport-and-fail-gracef.patch
A 0011-Add-support-for-scripts-pre-post-for-subpackages.patch
A 0012-typo-in-gem2rpm.yml.documentation-custom_pkgs-instea.patch
A 0013-Also-tag-LICENSE-MIT-as-docfile.patch
A 0014-Refactor-into-multiple-lines.patch
A 0015-Add-licence-to-the-list-of-license-files-as-well.patch
A 0016-add-two-more-ways-to-express-changes.patch
-------------------------------------------------------------------
Tue Oct 21 13:15:04 UTC 2014 - mrueckert@suse.de

22
rubygem-gem2rpm.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package rubygem-gem2rpm
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -14,6 +14,8 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%bcond_without gem2rpm_bootstrap
%bcond_with ruby18
%bcond_with ruby19
@ -31,8 +33,8 @@ Release: 0
%define mod_weight 1001
#define rb_build_versions %{rb_default_ruby}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ruby-macros >= 5
BuildRequires: %{ruby}
BuildRequires: ruby-macros >= 5
%if %{with gem2rpm_bootstrap}
#!BuildIgnore: rubygem(gem2rpm) rubygem(ruby:2.1.0:gem2rpm) rubygem(ruby:2.2.0:gem2rpm) rubygem(rbx:2.2:gem2rpm)
%else
@ -52,6 +54,14 @@ Patch4: 0005-properly-shorten-description-and-summary.patch
Patch5: 0006-Preserve-the-license-header-found-in-the-output-file.patch
Patch6: 0007-fixes-for-the-opensuse-template.patch
Patch7: 0008-do-not-use-not-.-not-supported-on-1.8-e.g.patch
Patch8: 0010-Try-to-load-rbconfigpackagingsupport-and-fail-gracef.patch
Patch9: 0011-Add-support-for-scripts-pre-post-for-subpackages.patch
Patch10: 0012-typo-in-gem2rpm.yml.documentation-custom_pkgs-instea.patch
Patch11: 0013-Also-tag-LICENSE-MIT-as-docfile.patch
Patch12: 0014-Refactor-into-multiple-lines.patch
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
Summary: Generate rpm specfiles from gems
License: GPL-2.0+
Group: Development/Languages/Ruby
@ -71,6 +81,14 @@ The spec file tries to follow the gem as closely as possible
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%build
%gem_build