- Update from git. Add:

A    0027-quote-version_suffix-in-gem2rpm.yml.documentation-to.patch
A    0028-add-binary_map-support.patch
A    0029-Use-or-for-the-conditions-instead-of-and.patch
A    0030-gem_package.spec.erb-sync-with-ruby-common.patch
A    0031-use-template-opensuse-on-openSUSE-Tumbleweed-where-e.patch
A    0032-Replace-no-rdoc-no-ri-with-no-document.patch
And refresh all others
Remove:
D    binary_map.patch
D    enhances.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/rubygem-gem2rpm?expand=0&rev=35

0001-use-the-ID-from-os-release-to-use-the-proper-templat.patch

@@ -1,7 +1,7 @@
 From 91bc63e3fbba24a5f90c4fce4f74b371c4694657 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de>
 Date: Thu, 24 Jul 2014 16:46:19 +0200
-Subject: [PATCH 01/26] - use the ID from os-release to use the proper template
+Subject: [PATCH 01/32] - use the ID from os-release to use the proper template
 
 ---
  bin/gem2rpm | 10 ++++++++++
@@ -11,10 +11,11 @@ diff --git a/bin/gem2rpm b/bin/gem2rpm
 index 736a645..fa7ce6b 100755
 --- a/bin/gem2rpm
 +++ b/bin/gem2rpm
-@@ -68,6 +68,16 @@ rest = opts.permute(ARGV)
+@@ -67,6 +67,16 @@ opts.separator("")
+ rest = opts.permute(ARGV)
  
  template = nil
- if template_file.nil?
++if template_file.nil?
 +  f = open("/etc/os-release", "r") if File.exists?("/etc/os-release")
 +  if f
 +    f.read.split('\n').each do |line|
@@ -24,10 +25,9 @@ index 736a645..fa7ce6b 100755
 +    f = nil
 +  end
 +end
-+if template_file.nil?
+ if template_file.nil?
    template = Gem2Rpm::TEMPLATE
  else
-   begin
 -- 
-2.10.2
+2.20.1
 

0002-added-basic-config-file-support-to-gem2rpm-in-yaml-f.patch

@@ -1,7 +1,7 @@
 From 1742038eb7ec8fcb25009ce8b270b420183875bc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de>
 Date: Thu, 24 Jul 2014 16:54:45 +0200
-Subject: [PATCH 02/26] added basic config file support to gem2rpm in yaml
+Subject: [PATCH 02/32] added basic config file support to gem2rpm in yaml
  format.
 
 There is no validation as it is basically a hash where certain keys are
@@ -89,5 +89,5 @@ index 017ecd1..e5e2693 100644
      unless local
        begin
 -- 
-2.10.2
+2.20.1
 

0003-new-opensuse-templates.-they-require-the-config-file.patch

@@ -1,12 +1,12 @@
 From 5e1e30e5addc99825b3bf873983ca48732493060 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de>
 Date: Thu, 24 Jul 2014 16:55:57 +0200
-Subject: [PATCH 03/26] new opensuse templates. they require the config file
+Subject: [PATCH 03/32] new opensuse templates. they require the config file
  support.
 
 ---
- templates/gem_packages.spec.erb | 236 ++++++++++++++++++++++++++++++++++++++++
+ templates/gem_packages.spec.erb | 236 ++++++++++++++++++++++++++++++++
- templates/opensuse.spec.erb     | 213 ++++++++++++++++++++++++++++++------
+ templates/opensuse.spec.erb     | 213 +++++++++++++++++++++++-----
  2 files changed, 414 insertions(+), 35 deletions(-)
  create mode 100644 templates/gem_packages.spec.erb
 
@@ -503,5 +503,5 @@ index 37de592..25fdec3 100644
  
  %changelog
 -- 
-2.10.2
+2.20.1
 

0004-added-example-gem2rpm.yml.patch

@@ -1,11 +1,11 @@
 From f408e57b282cd55d59c1317240ee9e0dc679373c Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de>
 Date: Thu, 24 Jul 2014 17:02:56 +0200
-Subject: [PATCH 04/26] added example gem2rpm.yml
+Subject: [PATCH 04/32] added example gem2rpm.yml
 
 ---
  Rakefile                  |  2 +-
- gem2rpm.yml.documentation | 70 +++++++++++++++++++++++++++++++++++++++++++++++
+ gem2rpm.yml.documentation | 70 +++++++++++++++++++++++++++++++++++++++
  2 files changed, 71 insertions(+), 1 deletion(-)
  create mode 100644 gem2rpm.yml.documentation
 
@@ -86,5 +86,5 @@ index 0000000..5e444eb
 +#       /bin/echo foo
 +#
 -- 
-2.10.2
+2.20.1
 

0005-properly-shorten-description-and-summary.patch

@@ -1,7 +1,7 @@
 From da07cd470611c3c6b70fc863e2d82a2862a068e4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de>
 Date: Thu, 24 Jul 2014 17:09:35 +0200
-Subject: [PATCH 05/26] properly shorten description and summary
+Subject: [PATCH 05/32] properly shorten description and summary
 
 This also includes the description if we reuse the summary.
 ---
@@ -54,5 +54,5 @@ index 9a8d5a1..2e4f7b2 100644
      def development_dependencies
        super.map {|d| Gem2Rpm::Dependency.new d}
 -- 
-2.10.2
+2.20.1
 

0006-Preserve-the-license-header-found-in-the-output-file.patch

@@ -1,7 +1,7 @@
 From 0f22d81f982e02523c852521a5b94db657fe6673 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de>
 Date: Thu, 24 Jul 2014 17:17:33 +0200
-Subject: [PATCH 06/26] Preserve the license header found in the output file
+Subject: [PATCH 06/32] Preserve the license header found in the output file
 
 ---
  bin/gem2rpm    | 13 +++++++++++--
@@ -57,5 +57,5 @@ index 5261ae1..d30e0f6 100644
      download_path = ""
      unless local
 -- 
-2.10.2
+2.20.1
 

0007-fixes-for-the-opensuse-template.patch

@@ -1,7 +1,7 @@
 From eed51b54253c303c593d9466ed8ed17523bda3d1 Mon Sep 17 00:00:00 2001
 From: Stephan Kulow <coolo@suse.de>
 Date: Wed, 15 Oct 2014 10:38:29 +0200
-Subject: [PATCH 07/26] fixes for the opensuse template:
+Subject: [PATCH 07/32] fixes for the opensuse template:
 
 - add one more space for sources
 - add empty lines in front of the warning preamble - otherwise format_spec_file
@@ -52,5 +52,5 @@ index 25fdec3..8bc281c 100644
   end -%>
  <% if config[:patches] -%>
 -- 
-2.10.2
+2.20.1
 

0008-do-not-use-not-.-not-supported-on-1.8-e.g.patch

@@ -1,7 +1,7 @@
 From ba7932c7d7bc6a70a45ac6ebb841a9e1bf8bb86b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
 Date: Tue, 21 Oct 2014 14:54:55 +0200
-Subject: [PATCH 08/26] do not use not(). not supported on 1.8 e.g.
+Subject: [PATCH 08/32] do not use not(). not supported on 1.8 e.g.
 
 ---
  templates/gem_packages.spec.erb | 4 ++--
@@ -30,5 +30,5 @@ index 058660b..94d4005 100644
  %defattr(-,root,root,-)
  %doc <%= gem_doc_dir %>
 -- 
-2.10.2
+2.20.1
 

0009-No-longer-require-the-ruby-version-inside-the-subpac.patch

@@ -1,7 +1,7 @@
 From 13b02a1596a744ed70687dae0ffb465e1979221e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
 Date: Tue, 21 Oct 2014 15:13:31 +0200
-Subject: [PATCH 09/26] No longer require the ruby version inside the
+Subject: [PATCH 09/32] No longer require the ruby version inside the
  subpackage
 
 With the buildrequires we already make sure that the package is only
@@ -28,5 +28,5 @@ index 94d4005..29873e5 100644
  <% if config[:main] && config[:main][:preamble] -%>
  <%= config[:main][:preamble] %>
 -- 
-2.10.2
+2.20.1
 

0010-Try-to-load-rbconfigpackagingsupport-and-fail-gracef.patch

@@ -1,7 +1,7 @@
 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/26] Try to load rbconfigpackagingsupport and fail
+Subject: [PATCH 10/32] Try to load rbconfigpackagingsupport and fail
  gracefully if not available
 
 The file will patch ruby_install_name on unversioned ruby installations.
@@ -24,5 +24,5 @@ index 29873e5..a6ab58b 100644
      path.gsub(/\/-/, "/#{mod_full_name}")
    end
 -- 
-2.10.2
+2.20.1
 

0011-Add-support-for-scripts-pre-post-for-subpackages.patch

@@ -1,7 +1,7 @@
 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/26] Add support for :scripts: (pre/post) for subpackages
+Subject: [PATCH 11/32] 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:
@@ -40,5 +40,5 @@ index 8bc281c..af04eaf 100644
     end
  -%>
 -- 
-2.10.2
+2.20.1
 

0012-typo-in-gem2rpm.yml.documentation-custom_pkgs-instea.patch

@@ -1,7 +1,7 @@
 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/26] typo in gem2rpm.yml.documentation: :custom_pkgs:
+Subject: [PATCH 12/32] typo in gem2rpm.yml.documentation: :custom_pkgs:
  instead of :custom:
 
 ---
@@ -22,5 +22,5 @@ index 5e444eb..376eacd 100644
  #     :preamble: |-
  #       Requires: .....
 -- 
-2.10.2
+2.20.1
 

0013-Also-tag-LICENSE-MIT-as-docfile.patch

@@ -1,7 +1,7 @@
 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/26] Also tag LICENSE-MIT as docfile
+Subject: [PATCH 13/32] Also tag LICENSE-MIT as docfile
 
 Some packages (e.g. rubygem-http_parser) name it that way
 ---
@@ -36,5 +36,5 @@ index af04eaf..8eb7fee 100644
        #$stderr.puts "PATH #{path} #{bpath} #{file}"
        docdirfiles << path if bpath == file
 -- 
-2.10.2
+2.20.1
 

0014-Refactor-into-multiple-lines.patch

@@ -1,7 +1,7 @@
 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/26] Refactor into multiple lines
+Subject: [PATCH 14/32] Refactor into multiple lines
 
 Makes this easier to extend/read imho.
 ---
@@ -54,5 +54,5 @@ index 8eb7fee..88e7356 100644
        #$stderr.puts "PATH #{path} #{bpath} #{file}"
        docdirfiles << path if bpath == file
 -- 
-2.10.2
+2.20.1
 

0015-Add-licence-to-the-list-of-license-files-as-well.patch

@@ -1,7 +1,7 @@
 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/26] Add 'licence' to the list of license files as well
+Subject: [PATCH 15/32] Add 'licence' to the list of license files as well
 
 This is a misspelling, but seems to be common enough still
 ---
@@ -34,5 +34,5 @@ index 88e7356..8d14e38 100644
          license-mit
          mit-license
 -- 
-2.10.2
+2.20.1
 

0016-add-two-more-ways-to-express-changes.patch

@@ -1,7 +1,7 @@
 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/26] add two more ways to express changes
+Subject: [PATCH 16/32] add two more ways to express changes
 
 ---
  templates/gem_packages.spec.erb | 2 ++
@@ -35,5 +35,5 @@ index 8d14e38..b1251c5 100644
         ).each { |file|
        bpath = path.downcase.gsub(%r{\.rdoc$}, '').gsub(%r{\.txt$}, '').gsub(%r{\.md$}, '')
 -- 
-2.10.2
+2.20.1
 

0017-.markdown-is-also-seen-in-the-wild.patch

@@ -1,7 +1,7 @@
 From 660fa598f3a78f94f35e1edf10d143dae5db62bb Mon Sep 17 00:00:00 2001
 From: Stephan Kulow <coolo@suse.de>
 Date: Wed, 11 Feb 2015 02:30:14 +0100
-Subject: [PATCH 17/26] .markdown is also seen in the wild
+Subject: [PATCH 17/32] .markdown is also seen in the wild
 
 ---
  templates/gem_packages.spec.erb | 2 +-
@@ -35,5 +35,5 @@ index b1251c5..a5f34c6 100644
        docdirfiles << path if bpath == file
       }
 -- 
-2.10.2
+2.20.1
 

0018-Only-use-the-extensions-doc-dir-on-MRI-2.1.x.patch

@@ -1,7 +1,7 @@
 From 7a45c828d05304d90b3a202e55acbbcaab5cdac2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
 Date: Fri, 13 Mar 2015 03:24:25 +0100
-Subject: [PATCH 18/26] Only use the extensions doc dir on MRI 2.1.x
+Subject: [PATCH 18/32] Only use the extensions doc dir on MRI 2.1.x
 
 ---
  templates/gem_packages.spec.erb | 3 +++
@@ -22,5 +22,5 @@ index 9e2e877..80e552e 100644
        rp = gem_spec.extensions_dir.rpartition(gem_spec.base_dir)
        return File.join(rp[1], 'doc', rp[2]) 
 -- 
-2.10.2
+2.20.1
 

0019-Cleaner-solution-for-the-extensions-doc-dir.patch

@@ -1,7 +1,7 @@
 From 672a0405c2c191280887b4427a759490aa2ce5ad Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
 Date: Fri, 13 Mar 2015 14:53:04 +0100
-Subject: [PATCH 19/26] Cleaner solution for the extensions doc dir
+Subject: [PATCH 19/32] Cleaner solution for the extensions doc dir
 
 The other solution was also failing on 1.8
 ---
@@ -26,5 +26,5 @@ index 80e552e..661539a 100644
        return File.join(rp[1], 'doc', rp[2]) 
      end
 -- 
-2.10.2
+2.20.1
 

0020-Ruby-1.8-insists-on-the-for-the-parameter.patch

@@ -1,7 +1,7 @@
 From f6ace6130df3a2ea6ca8e987e9675d652940510e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
 Date: Fri, 13 Mar 2015 15:06:01 +0100
-Subject: [PATCH 20/26] Ruby 1.8 insists on the () for the parameter
+Subject: [PATCH 20/32] Ruby 1.8 insists on the () for the parameter
 
 ---
  templates/gem_packages.spec.erb | 2 +-
@@ -21,5 +21,5 @@ index 661539a..6add6a7 100644
        rp = gem_spec.extensions_dir.rpartition(gem_spec.base_dir)
        return File.join(rp[1], 'doc', rp[2]) 
 -- 
-2.10.2
+2.20.1
 

0021-Fix-company-name-in-copyright-header.patch

@@ -1,7 +1,7 @@
 From 2d02399fc670b648785b10bf7f1510c136e6f981 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
 Date: Thu, 16 Apr 2015 23:49:01 +0200
-Subject: [PATCH 21/26] Fix company name in copyright header
+Subject: [PATCH 21/32] Fix company name in copyright header
 
 ---
  templates/opensuse.spec.erb | 2 +-
@@ -21,5 +21,5 @@ index a5f34c6..57bf9ff 100644
  # All modifications and additions to the file contributed by third parties
  # remain the property of their copyright owners, unless otherwise agreed
 -- 
-2.10.2
+2.20.1
 

0022-add-the-touch-for-build-compare-to-the-template.patch

@@ -1,7 +1,7 @@
 From f8c0600c659f26d1ec6c9d890a63dd642f741003 Mon Sep 17 00:00:00 2001
 From: Stephan Kulow <coolo@suse.de>
 Date: Wed, 6 Apr 2016 08:00:27 +0200
-Subject: [PATCH 22/26] add the touch for build-compare to the template
+Subject: [PATCH 22/32] add the touch for build-compare to the template
 
 ---
  templates/opensuse.spec.erb | 1 +
@@ -20,5 +20,5 @@ index 57bf9ff..22c4647 100644
  <% end -%>
  
 -- 
-2.10.2
+2.20.1
 

0023-Also-tag-APACHE-LICENSE-2.0-as-docfile.patch

@@ -1,7 +1,7 @@
 From ee81c7f09669db9e6898df5bf36ac6c102d0d615 Mon Sep 17 00:00:00 2001
 From: Thomas Bechtold <tbechtold@suse.com>
 Date: Mon, 18 Jul 2016 10:12:29 +0200
-Subject: [PATCH 23/26] Also tag APACHE-LICENSE-2.0 as docfile
+Subject: [PATCH 23/32] Also tag APACHE-LICENSE-2.0 as docfile
 
 Some packages (e.g. rubygem-apipie-rails) name it that way
 ---
@@ -22,5 +22,5 @@ index 22c4647..5b62b26 100644
          news
          release_notes
 -- 
-2.10.2
+2.20.1
 

0024-add-ability-to-provide-alternative-main-Source.patch

@@ -1,7 +1,7 @@
 From 3888b107af6ce5721ff40abe2bedcede1893732b Mon Sep 17 00:00:00 2001
 From: Theo Chatzimichos <tampakrap@gmail.com>
 Date: Tue, 23 Aug 2016 23:49:40 +0200
-Subject: [PATCH 24/26] add ability to provide alternative main Source
+Subject: [PATCH 24/32] add ability to provide alternative main Source
 
 this is useful in cases where the gem is not taken from rubygems.org
 ---
@@ -25,5 +25,5 @@ index 5b62b26..ae2d458 100644
       config[:sources].each_with_index do |src, i| -%>
  Source<%= i+1 %>:        <%= src %>
 -- 
-2.10.2
+2.20.1
 

0025-allow-running-commands-after-patching.patch

@@ -1,7 +1,7 @@
 From e9601db421071203202ddb0122e8826859238e73 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de>
 Date: Thu, 10 Nov 2016 15:46:22 +0100
-Subject: [PATCH 25/26] allow running commands after patching
+Subject: [PATCH 25/32] allow running commands after patching
 
 but before we actually rebuild the gem.
 needed for libv8 gem.
@@ -40,5 +40,5 @@ index ae2d458..e6e9a1a 100644
  %gem_build
  <% end -%>
 -- 
-2.10.2
+2.20.1
 

0026-use-https-instead-of-http-for-rubygems.org.patch

@@ -1,7 +1,7 @@
 From 304e55ea06e789e41683351c3eca7e8f20619201 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de>
 Date: Thu, 10 Nov 2016 18:16:23 +0100
-Subject: [PATCH 26/26] use https instead of http for rubygems.org
+Subject: [PATCH 26/32] use https instead of http for rubygems.org
 
 ---
  bin/gem2rpm                 | 2 +-
@@ -35,5 +35,5 @@ index e6e9a1a..b070745 100644
  <% if config[:sources]
       config[:sources].each_with_index do |src, i| -%>
 -- 
-2.10.2
+2.20.1
 

0027-quote-version_suffix-in-gem2rpm.yml.documentation-to.patch

@@ -0,0 +1,26 @@
+From 5ed4ebe4fce32e32c75019aa4ac01b78e22c2e44 Mon Sep 17 00:00:00 2001
+From: Johannes Kastl <kastl@b1-systems.de>
+Date: Fri, 3 Nov 2017 14:46:39 +0100
+Subject: [PATCH 27/32] quote version_suffix in gem2rpm.yml.documentation to
+ avoid wrong package names
+
+---
+ gem2rpm.yml.documentation | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gem2rpm.yml.documentation b/gem2rpm.yml.documentation
+index fbed82e..bb4893d 100644
+--- a/gem2rpm.yml.documentation
++++ b/gem2rpm.yml.documentation
+@@ -9,7 +9,7 @@
+ # ## used by gem2rpm
+ # :license: MIT or Ruby
+ # ## used by gem2rpm and gem_packages
+-# :version_suffix: -x_y
++# :version_suffix: '-x_y'
+ # ## used by gem2rpm and gem_packages
+ # :disable_docs: true
+ # ## used by gem2rpm
+-- 
+2.20.1
+

0028-add-binary_map-support.patch

@@ -1,3 +1,13 @@
+From fdf7e5ceb4c165babfb7486fe6640faa21ab5e12 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
+Date: Wed, 6 Jun 2018 16:15:39 +0200
+Subject: [PATCH 28/32] add binary_map support
+
+---
+ gem2rpm.yml.documentation       |  2 ++
+ templates/gem_packages.spec.erb | 24 ++++++++++++++++--------
+ 2 files changed, 18 insertions(+), 8 deletions(-)
+
 diff --git a/gem2rpm.yml.documentation b/gem2rpm.yml.documentation
 index bb4893d..5b9e4e3 100644
 --- a/gem2rpm.yml.documentation
@@ -12,16 +22,15 @@ index bb4893d..5b9e4e3 100644
  # ## used by gem2rpm
  # :pre_install: |-
 diff --git a/templates/gem_packages.spec.erb b/templates/gem_packages.spec.erb
-index 6add6a7..257c719 100644
+index 6add6a7..4861bbd 100644
 --- a/templates/gem_packages.spec.erb
 +++ b/templates/gem_packages.spec.erb
-@@ -30,6 +30,14 @@
+@@ -30,6 +30,13 @@
      weight=v1*10000+v2*100+v3
    end
  
 +  def self.map_executable(config, executable)
-+    if not(config[:binary_map].nil? or
++    if not(config[:binary_map].nil? and config[:binary_map][executable].nil?)
-+           config[:binary_map][executable].nil?)
 +      executable=config[:binary_map][executable]
 +    end
 +    executable
@@ -30,42 +39,15 @@ index 6add6a7..257c719 100644
    def self.filecontent_or_value(path)
      (path and File.exists?(path)) ? File.read(path) : path
    end
-@@ -54,6 +62,8 @@
+@@ -93,6 +100,7 @@ Group:          Development/Languages/Ruby
-   end
+ <% unless spec.executables.empty? -%>
-   
+ PreReq:         update-alternatives
-   rb_suffix          = RbConfig::CONFIG['ruby_install_name'].gsub(/^ruby/, '')
+ <% end -%>
-+  # TODO: "ruby" hardcoded here is wrong. it should support jruby/rubinius or so
++Enhances:       <%= rb_pkgname %>
-+  rb_abi             = "ruby:#{RbConfig::CONFIG['ruby_version']}"
-   rb_pkgname         = RbConfig::CONFIG['ruby_install_name'].gsub(/^ruby\./, '')
-   if rb_suffix =~ /\A\d+\.\d+\z/
-     rb_suffix  = '.ruby' + rb_suffix
-@@ -70,6 +80,7 @@
-   gem_spec           = Gem::Specification.new
-   gem_base_dir       = patch_libdir(gem_spec.base_dir)
-   gem_cache_dir      = patch_libdir(gem_spec.cache_dir)
-+  gem_build_info_dir = patch_libdir(gem_spec.build_info_dir)
-   gem_gems_dir       = patch_libdir(gem_spec.gems_dir)
-   gem_spec_dir       = patch_libdir(gem_spec.spec_dir)
-   gem_bin_dir        = patch_libdir(patch_mod_full_name(gem_spec.bin_dir , mod_full_name ))
-@@ -101,7 +112,7 @@ PreReq:         update-alternatives
- %package -n <%= pkg_basename %>-doc<%= config[:version_suffix] %>
- Summary:        RDoc documentation for <%= spec.name %>
- Group:          Development/Languages/Ruby
--Requires:       <%= pkg_basename %><%= config[:version_suffix] %> = <%= spec.version %>
-+Requires:       rubygem(<%= rb_abi %>:<%= spec.name %>) = <%= spec.version %>
  
- %description -n <%= pkg_basename %>-doc<%= config[:version_suffix] %>
+ %description -n <%= pkg_basename %><%= config[:version_suffix] %>
- Documentation generated at gem installation time.
+ <%= config[:description] or spec.description -%>
-@@ -146,7 +157,7 @@ Usually in RDoc and RI formats.
+@@ -157,19 +165,19 @@ Test::Unit or RSpec files, useful for developers.
- %package -n <%= pkg_basename %>-testsuite<%= config[:version_suffix] %>
- Summary:        Test suite for <%= spec.name %>
- Group:          Development/Languages/Ruby
--Requires:       <%= pkg_basename %><%= config[:version_suffix] %> = <%= spec.version %>
-+Requires:       rubygem(<%= rb_abi %>:<%= spec.name %>) = <%= spec.version %>
- 
- %description -n <%= pkg_basename %>-testsuite<%= config[:version_suffix] %>
- Test::Unit or RSpec files, useful for developers.
-@@ -157,19 +168,19 @@ Test::Unit or RSpec files, useful for developers.
  %post -n <%= pkg_basename %><%= config[:version_suffix] %>
  <% spec.executables.each do |executable| -%>
  /usr/sbin/update-alternatives --install \
@@ -91,7 +73,7 @@ index 6add6a7..257c719 100644
  <% end -%>
  fi
  <% end -%>
-@@ -188,14 +199,15 @@ fi
+@@ -188,8 +196,8 @@ fi
  <%= rb_bindir %>/<%= "#{executable}#{rb_suffix}-#{spec.version}" %>
  <%= rb_bindir %>/<%= "#{executable}#{rb_suffix}" %>
  <%= rb_bindir %>/<%= "#{executable}-#{spec.version}" %>
@@ -102,19 +84,6 @@ index 6add6a7..257c719 100644
  %ghost <%= rb_sysconfdir %>/alternatives/<%= "#{executable}#{rb_suffix}" %>
  %ghost <%= rb_sysconfdir %>/alternatives/<%= "#{executable}-#{spec.version}" %>
  <% end -%>
- # cache file
+-- 
- <%= gem_cache_dir %>/<%= mod_full_name %>.gem
+2.20.1
- <%= gem_gem_dir %>
+
-+<%= gem_build_info_dir %>
- <% unless spec.extensions.empty? or gem_extension_dir.nil? -%>
- <%= gem_extension_dir %>
- <% end -%>
-@@ -231,7 +243,7 @@ fi
- Summary:        <%= custom_pkg_name %> sub package for <%= spec.name %>
- Group:          Development/Languages/Ruby
- <% end %>
--Requires:       <%= pkg_basename %><%= config[:version_suffix] %> = <%= spec.version %>
-+Requires:       rubygem(<%= rb_abi %>:<%= spec.name %>) = <%= spec.version %>
- %description -n <%= pkg_basename %>-<%= custom_pkg_name %><%= config[:version_suffix] %>
- <% if data[:description] and data[:description] != '' -%>
- <%= data[:description] %>

0029-Use-or-for-the-conditions-instead-of-and.patch

@@ -0,0 +1,26 @@
+From 04d2ef0c24748dd4120d1cc3a7b08d5c963dc100 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
+Date: Wed, 6 Jun 2018 16:40:15 +0200
+Subject: [PATCH 29/32] Use "or" for the conditions instead of and
+
+---
+ templates/gem_packages.spec.erb | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/templates/gem_packages.spec.erb b/templates/gem_packages.spec.erb
+index 4861bbd..b704b91 100644
+--- a/templates/gem_packages.spec.erb
++++ b/templates/gem_packages.spec.erb
+@@ -31,7 +31,8 @@
+   end
+ 
+   def self.map_executable(config, executable)
+-    if not(config[:binary_map].nil? and config[:binary_map][executable].nil?)
++    if not(config[:binary_map].nil? or
++           config[:binary_map][executable].nil?)
+       executable=config[:binary_map][executable]
+     end
+     executable
+-- 
+2.20.1
+

0030-gem_package.spec.erb-sync-with-ruby-common.patch

@@ -0,0 +1,77 @@
+From c4557ce4aa7e0f67e5c249c255fe0c0c5df8f793 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
+Date: Wed, 6 Jun 2018 17:15:35 +0200
+Subject: [PATCH 30/32] gem_package.spec.erb: sync with ruby-common
+
+Also drop the Enhances change that sneaked in by accident
+---
+ templates/gem_packages.spec.erb | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/templates/gem_packages.spec.erb b/templates/gem_packages.spec.erb
+index b704b91..257c719 100644
+--- a/templates/gem_packages.spec.erb
++++ b/templates/gem_packages.spec.erb
+@@ -62,6 +62,8 @@
+   end
+   
+   rb_suffix          = RbConfig::CONFIG['ruby_install_name'].gsub(/^ruby/, '')
++  # TODO: "ruby" hardcoded here is wrong. it should support jruby/rubinius or so
++  rb_abi             = "ruby:#{RbConfig::CONFIG['ruby_version']}"
+   rb_pkgname         = RbConfig::CONFIG['ruby_install_name'].gsub(/^ruby\./, '')
+   if rb_suffix =~ /\A\d+\.\d+\z/
+     rb_suffix  = '.ruby' + rb_suffix
+@@ -78,6 +80,7 @@
+   gem_spec           = Gem::Specification.new
+   gem_base_dir       = patch_libdir(gem_spec.base_dir)
+   gem_cache_dir      = patch_libdir(gem_spec.cache_dir)
++  gem_build_info_dir = patch_libdir(gem_spec.build_info_dir)
+   gem_gems_dir       = patch_libdir(gem_spec.gems_dir)
+   gem_spec_dir       = patch_libdir(gem_spec.spec_dir)
+   gem_bin_dir        = patch_libdir(patch_mod_full_name(gem_spec.bin_dir , mod_full_name ))
+@@ -101,7 +104,6 @@ Group:          Development/Languages/Ruby
+ <% unless spec.executables.empty? -%>
+ PreReq:         update-alternatives
+ <% end -%>
+-Enhances:       <%= rb_pkgname %>
+ 
+ %description -n <%= pkg_basename %><%= config[:version_suffix] %>
+ <%= config[:description] or spec.description -%>
+@@ -110,7 +112,7 @@ Enhances:       <%= rb_pkgname %>
+ %package -n <%= pkg_basename %>-doc<%= config[:version_suffix] %>
+ Summary:        RDoc documentation for <%= spec.name %>
+ Group:          Development/Languages/Ruby
+-Requires:       <%= pkg_basename %><%= config[:version_suffix] %> = <%= spec.version %>
++Requires:       rubygem(<%= rb_abi %>:<%= spec.name %>) = <%= spec.version %>
+ 
+ %description -n <%= pkg_basename %>-doc<%= config[:version_suffix] %>
+ Documentation generated at gem installation time.
+@@ -155,7 +157,7 @@ Usually in RDoc and RI formats.
+ %package -n <%= pkg_basename %>-testsuite<%= config[:version_suffix] %>
+ Summary:        Test suite for <%= spec.name %>
+ Group:          Development/Languages/Ruby
+-Requires:       <%= pkg_basename %><%= config[:version_suffix] %> = <%= spec.version %>
++Requires:       rubygem(<%= rb_abi %>:<%= spec.name %>) = <%= spec.version %>
+ 
+ %description -n <%= pkg_basename %>-testsuite<%= config[:version_suffix] %>
+ Test::Unit or RSpec files, useful for developers.
+@@ -205,6 +207,7 @@ fi
+ # cache file
+ <%= gem_cache_dir %>/<%= mod_full_name %>.gem
+ <%= gem_gem_dir %>
++<%= gem_build_info_dir %>
+ <% unless spec.extensions.empty? or gem_extension_dir.nil? -%>
+ <%= gem_extension_dir %>
+ <% end -%>
+@@ -240,7 +243,7 @@ fi
+ Summary:        <%= custom_pkg_name %> sub package for <%= spec.name %>
+ Group:          Development/Languages/Ruby
+ <% end %>
+-Requires:       <%= pkg_basename %><%= config[:version_suffix] %> = <%= spec.version %>
++Requires:       rubygem(<%= rb_abi %>:<%= spec.name %>) = <%= spec.version %>
+ %description -n <%= pkg_basename %>-<%= custom_pkg_name %><%= config[:version_suffix] %>
+ <% if data[:description] and data[:description] != '' -%>
+ <%= data[:description] %>
+-- 
+2.20.1
+

0031-use-template-opensuse-on-openSUSE-Tumbleweed-where-e.patch

@@ -0,0 +1,28 @@
+From 7fa4f56a2a55278e95510d1663c495fa733d7780 Mon Sep 17 00:00:00 2001
+From: Johannes Kastl <kastl@b1-systems.de>
+Date: Sat, 21 Jul 2018 23:13:35 +0200
+Subject: [PATCH 31/32] use template opensuse on openSUSE Tumbleweed, where
+ /etc/os-release contains ID="opensuse-tumbleweed"
+
+---
+ bin/gem2rpm | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/bin/gem2rpm b/bin/gem2rpm
+index 45ed21c..1298798 100755
+--- a/bin/gem2rpm
++++ b/bin/gem2rpm
+@@ -82,6 +82,10 @@ if template_file.nil?
+     f.close
+     f = nil
+   end
++  if template_file.eql? '"opensuse-tumbleweed"'
++    $stderr.puts 'Using template opensuse on Tumbleweed'
++    template_file = 'opensuse'
++  end
+ end
+ if template_file.nil?
+   template = Gem2Rpm::TEMPLATE
+-- 
+2.20.1
+

0032-Replace-no-rdoc-no-ri-with-no-document.patch

@@ -0,0 +1,25 @@
+From 9adb19584120941300dc8269f6a8563eb85b1a1c Mon Sep 17 00:00:00 2001
+From: Stephan Kulow <coolo@suse.de>
+Date: Sat, 23 Feb 2019 07:45:40 +0100
+Subject: [PATCH 32/32] Replace --no-rdoc --no-ri with --no-document
+
+---
+ templates/opensuse.spec.erb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/templates/opensuse.spec.erb b/templates/opensuse.spec.erb
+index b070745..4bcc224 100644
+--- a/templates/opensuse.spec.erb
++++ b/templates/opensuse.spec.erb
+@@ -165,7 +165,7 @@ find -type f -print0 | xargs -0 touch -r %{S:0}
+ <%= config[:gem_install_args] %> \
+ <% end -%>
+ <% if config[:disable_docs] -%>
+-  --no-rdoc --no-ri \
++  --no-document \
+ <% end -%>
+ <% unless spec.executables.empty? -%>
+   --symlink-binaries \
+-- 
+2.20.1
+

enhances.patch

@@ -1,12 +0,0 @@
-diff --git a/templates/gem_packages.spec.erb b/templates/gem_packages.spec.erb
-index 6add6a7..4119bdf 100644
---- a/templates/gem_packages.spec.erb
-+++ b/templates/gem_packages.spec.erb
-@@ -93,6 +93,7 @@ Group:          Development/Languages/Ruby
- <% unless spec.executables.empty? -%>
- PreReq:         update-alternatives
- <% end -%>
-+Enhances:       <%= rb_pkgname %>
- 
- %description -n <%= pkg_basename %><%= config[:version_suffix] %>
- <%= config[:description] or spec.description -%>

rubygem-gem2rpm.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sat Feb 23 06:54:36 UTC 2019 - Stephan Kulow <coolo@suse.com>
+
+- Update from git. Add:
+A    0027-quote-version_suffix-in-gem2rpm.yml.documentation-to.patch
+A    0028-add-binary_map-support.patch
+A    0029-Use-or-for-the-conditions-instead-of-and.patch
+A    0030-gem_package.spec.erb-sync-with-ruby-common.patch
+A    0031-use-template-opensuse-on-openSUSE-Tumbleweed-where-e.patch
+A    0032-Replace-no-rdoc-no-ri-with-no-document.patch
+
+And refresh all others
+
+Remove:
+D    binary_map.patch
+D    enhances.patch
+
 -------------------------------------------------------------------
 Mon Feb  4 19:57:20 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 

rubygem-gem2rpm.spec

@@ -78,9 +78,13 @@ Patch23:        0023-Also-tag-APACHE-LICENSE-2.0-as-docfile.patch
 Patch24:        0024-add-ability-to-provide-alternative-main-Source.patch
 Patch25:        0025-allow-running-commands-after-patching.patch
 Patch26:        0026-use-https-instead-of-http-for-rubygems.org.patch
-Patch27:        binary_map.patch
+Patch27:        0027-quote-version_suffix-in-gem2rpm.yml.documentation-to.patch
-Patch28:        template_loader.patch
+Patch28:        0028-add-binary_map-support.patch
-Patch29:        enhances.patch
+Patch29:        0029-Use-or-for-the-conditions-instead-of-and.patch
+Patch30:        0030-gem_package.spec.erb-sync-with-ruby-common.patch
+Patch31:        0031-use-template-opensuse-on-openSUSE-Tumbleweed-where-e.patch
+Patch32:        0032-Replace-no-rdoc-no-ri-with-no-document.patch
+Patch128:       template_loader.patch
 Summary:        Generate rpm specfiles from gems
 License:        GPL-2.0-or-later
 Group:          Development/Languages/Ruby
@@ -121,7 +125,11 @@ The spec file tries to follow the gem as closely as possible
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
-#patch29 -p1
+%patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch128 -p1
 
 %build
 perl -p -i -e 's|("templates/opensuse.spec.erb".freeze)|$1, "templates/gem_packages.spec.erb".freeze|g' *gemspec

series

@@ -24,3 +24,9 @@
 0024-add-ability-to-provide-alternative-main-Source.patch -p1
 0025-allow-running-commands-after-patching.patch -p1
 0026-use-https-instead-of-http-for-rubygems.org.patch -p1
+0027-quote-version_suffix-in-gem2rpm.yml.documentation-to.patch -p1
+0028-add-binary_map-support.patch -p1
+0029-Use-or-for-the-conditions-instead-of-and.patch -p1
+0030-gem_package.spec.erb-sync-with-ruby-common.patch -p1
+0031-use-template-opensuse-on-openSUSE-Tumbleweed-where-e.patch -p1
+0032-Replace-no-rdoc-no-ri-with-no-document.patch -p1