From 75caa909b36758f976325f3d22679fda0e21fb46ee4d5be408c0e31b0915884c Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 7 Dec 2022 12:28:20 +0000 Subject: [PATCH] Accepting request 1041094 from home:mvidner:branches:devel:languages:ruby - Use git format-patch instead, fixing one more exists? occurrence - Note 0004-added-example-gem2rpm.yml.patch has the Rakefile hunk removed OBS-URL: https://build.opensuse.org/request/show/1041094 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/rubygem-gem2rpm?expand=0&rev=46 --- ...os-release-to-use-the-proper-templat.patch | 6 +- ...ig-file-support-to-gem2rpm-in-yaml-f.patch | 4 +- ...plates.-they-require-the-config-file.patch | 6 +- 0004-added-example-gem2rpm.yml.patch | 6 +- ...erly-shorten-description-and-summary.patch | 4 +- ...ense-header-found-in-the-output-file.patch | 6 +- 0007-fixes-for-the-opensuse-template.patch | 4 +- ...t-use-not-.-not-supported-on-1.8-e.g.patch | 4 +- ...e-the-ruby-version-inside-the-subpac.patch | 4 +- ...nfigpackagingsupport-and-fail-gracef.patch | 4 +- ...for-scripts-pre-post-for-subpackages.patch | 4 +- ...yml.documentation-custom_pkgs-instea.patch | 4 +- 0013-Also-tag-LICENSE-MIT-as-docfile.patch | 4 +- 0014-Refactor-into-multiple-lines.patch | 4 +- ...to-the-list-of-license-files-as-well.patch | 4 +- ...add-two-more-ways-to-express-changes.patch | 4 +- 0017-.markdown-is-also-seen-in-the-wild.patch | 4 +- ...-the-extensions-doc-dir-on-MRI-2.1.x.patch | 4 +- ...-solution-for-the-extensions-doc-dir.patch | 4 +- ...1.8-insists-on-the-for-the-parameter.patch | 4 +- ...Fix-company-name-in-copyright-header.patch | 4 +- ...ch-for-build-compare-to-the-template.patch | 4 +- ...so-tag-APACHE-LICENSE-2.0-as-docfile.patch | 4 +- ...y-to-provide-alternative-main-Source.patch | 4 +- ...llow-running-commands-after-patching.patch | 4 +- ...tps-instead-of-http-for-rubygems.org.patch | 4 +- ...ffix-in-gem2rpm.yml.documentation-to.patch | 4 +- 0028-add-binary_map-support.patch | 6 +- ...or-for-the-conditions-instead-of-and.patch | 4 +- ...ckage.spec.erb-sync-with-ruby-common.patch | 4 +- ...nsuse-on-openSUSE-Tumbleweed-where-e.patch | 4 +- ...place-no-rdoc-no-ri-with-no-document.patch | 4 +- ...nstead-of-File.exists-which-was-remo.patch | 65 +++++++++++++++++++ rubygem-gem2rpm.changes | 6 ++ rubygem-gem2rpm.spec | 2 + 35 files changed, 143 insertions(+), 68 deletions(-) create mode 100644 0033-Use-File.exist-instead-of-File.exists-which-was-remo.patch diff --git a/0001-use-the-ID-from-os-release-to-use-the-proper-templat.patch b/0001-use-the-ID-from-os-release-to-use-the-proper-templat.patch index d0a1311..6bcf227 100644 --- a/0001-use-the-ID-from-os-release-to-use-the-proper-templat.patch +++ b/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?= Date: Thu, 24 Jul 2014 16:46:19 +0200 -Subject: [PATCH 01/32] - use the ID from os-release to use the proper template +Subject: [PATCH 01/33] - use the ID from os-release to use the proper template --- bin/gem2rpm | 10 ++++++++++ @@ -16,7 +16,7 @@ index 736a645..fa7ce6b 100755 template = nil +if template_file.nil? -+ f = open("/etc/os-release", "r") if File.exist?("/etc/os-release") ++ f = open("/etc/os-release", "r") if File.exists?("/etc/os-release") + if f + f.read.split('\n').each do |line| + line.match(%r{^ID=(.*)$}) { |m| template_file=m[1] } @@ -29,5 +29,5 @@ index 736a645..fa7ce6b 100755 template = Gem2Rpm::TEMPLATE else -- -2.20.1 +2.26.2 diff --git a/0002-added-basic-config-file-support-to-gem2rpm-in-yaml-f.patch b/0002-added-basic-config-file-support-to-gem2rpm-in-yaml-f.patch index 031d4c4..682d066 100644 --- a/0002-added-basic-config-file-support-to-gem2rpm-in-yaml-f.patch +++ b/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?= Date: Thu, 24 Jul 2014 16:54:45 +0200 -Subject: [PATCH 02/32] added basic config file support to gem2rpm in yaml +Subject: [PATCH 02/33] 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.20.1 +2.26.2 diff --git a/0003-new-opensuse-templates.-they-require-the-config-file.patch b/0003-new-opensuse-templates.-they-require-the-config-file.patch index 81db53f..b815162 100644 --- a/0003-new-opensuse-templates.-they-require-the-config-file.patch +++ b/0003-new-opensuse-templates.-they-require-the-config-file.patch @@ -1,7 +1,7 @@ From 5e1e30e5addc99825b3bf873983ca48732493060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= Date: Thu, 24 Jul 2014 16:55:57 +0200 -Subject: [PATCH 03/32] new opensuse templates. they require the config file +Subject: [PATCH 03/33] new opensuse templates. they require the config file support. --- @@ -43,7 +43,7 @@ index 0000000..d1734db + end + + def self.filecontent_or_value(path) -+ (path and File.exist?(path)) ? File.read(path) : path ++ (path and File.exists?(path)) ? File.read(path) : path + end + + def self.parse_custom_pkgs(env_value) @@ -503,5 +503,5 @@ index 37de592..25fdec3 100644 %changelog -- -2.20.1 +2.26.2 diff --git a/0004-added-example-gem2rpm.yml.patch b/0004-added-example-gem2rpm.yml.patch index 114d15d..39a2801 100644 --- a/0004-added-example-gem2rpm.yml.patch +++ b/0004-added-example-gem2rpm.yml.patch @@ -1,8 +1,10 @@ From f408e57b282cd55d59c1317240ee9e0dc679373c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= Date: Thu, 24 Jul 2014 17:02:56 +0200 -Subject: [PATCH 04/32] added example gem2rpm.yml +Subject: [PATCH 04/33] added example gem2rpm.yml +This patch is edited to remove the Rakefile hunk. Rakefile is not part +of the *.gem --- Rakefile | 2 +- gem2rpm.yml.documentation | 70 +++++++++++++++++++++++++++++++++++++++ @@ -86,5 +88,5 @@ index 0000000..5e444eb +# /bin/echo foo +# -- -2.20.1 +2.26.2 diff --git a/0005-properly-shorten-description-and-summary.patch b/0005-properly-shorten-description-and-summary.patch index f8c4369..cecd183 100644 --- a/0005-properly-shorten-description-and-summary.patch +++ b/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?= Date: Thu, 24 Jul 2014 17:09:35 +0200 -Subject: [PATCH 05/32] properly shorten description and summary +Subject: [PATCH 05/33] 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.20.1 +2.26.2 diff --git a/0006-Preserve-the-license-header-found-in-the-output-file.patch b/0006-Preserve-the-license-header-found-in-the-output-file.patch index 7bab1c8..84feae5 100644 --- a/0006-Preserve-the-license-header-found-in-the-output-file.patch +++ b/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?= Date: Thu, 24 Jul 2014 17:17:33 +0200 -Subject: [PATCH 06/32] Preserve the license header found in the output file +Subject: [PATCH 06/33] Preserve the license header found in the output file --- bin/gem2rpm | 13 +++++++++++-- @@ -22,7 +22,7 @@ index 7f28603..8a6db05 100755 + Gem2Rpm::convert(gemfile, template, $stdout, nongem, local, doc_subpackage, oldlicense, config) unless deps else begin -+ if File.exist?(output_file) ++ if File.exists?(output_file) + File.open(output_file, 'r') do |oldfile| + oldfile.each_line do |line| + m = line.match(%r{^License:\s*(\w.*)$}) @@ -57,5 +57,5 @@ index 5261ae1..d30e0f6 100644 download_path = "" unless local -- -2.20.1 +2.26.2 diff --git a/0007-fixes-for-the-opensuse-template.patch b/0007-fixes-for-the-opensuse-template.patch index 7cdc7dc..17c1160 100644 --- a/0007-fixes-for-the-opensuse-template.patch +++ b/0007-fixes-for-the-opensuse-template.patch @@ -1,7 +1,7 @@ From eed51b54253c303c593d9466ed8ed17523bda3d1 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 15 Oct 2014 10:38:29 +0200 -Subject: [PATCH 07/32] fixes for the opensuse template: +Subject: [PATCH 07/33] 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.20.1 +2.26.2 diff --git a/0008-do-not-use-not-.-not-supported-on-1.8-e.g.patch b/0008-do-not-use-not-.-not-supported-on-1.8-e.g.patch index 5ba969b..554a6b5 100644 --- a/0008-do-not-use-not-.-not-supported-on-1.8-e.g.patch +++ b/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?= Date: Tue, 21 Oct 2014 14:54:55 +0200 -Subject: [PATCH 08/32] do not use not(). not supported on 1.8 e.g. +Subject: [PATCH 08/33] 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.20.1 +2.26.2 diff --git a/0009-No-longer-require-the-ruby-version-inside-the-subpac.patch b/0009-No-longer-require-the-ruby-version-inside-the-subpac.patch index 2532ab9..a72f01a 100644 --- a/0009-No-longer-require-the-ruby-version-inside-the-subpac.patch +++ b/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?= Date: Tue, 21 Oct 2014 15:13:31 +0200 -Subject: [PATCH 09/32] No longer require the ruby version inside the +Subject: [PATCH 09/33] 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.20.1 +2.26.2 diff --git a/0010-Try-to-load-rbconfigpackagingsupport-and-fail-gracef.patch b/0010-Try-to-load-rbconfigpackagingsupport-and-fail-gracef.patch index 5b64aa6..1b19a1c 100644 --- a/0010-Try-to-load-rbconfigpackagingsupport-and-fail-gracef.patch +++ b/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?= Date: Tue, 21 Oct 2014 17:55:23 +0200 -Subject: [PATCH 10/32] Try to load rbconfigpackagingsupport and fail +Subject: [PATCH 10/33] 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.20.1 +2.26.2 diff --git a/0011-Add-support-for-scripts-pre-post-for-subpackages.patch b/0011-Add-support-for-scripts-pre-post-for-subpackages.patch index 95d6986..11c3b83 100644 --- a/0011-Add-support-for-scripts-pre-post-for-subpackages.patch +++ b/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 Date: Fri, 5 Dec 2014 17:11:47 +0200 -Subject: [PATCH 11/32] Add support for :scripts: (pre/post) for subpackages +Subject: [PATCH 11/33] 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.20.1 +2.26.2 diff --git a/0012-typo-in-gem2rpm.yml.documentation-custom_pkgs-instea.patch b/0012-typo-in-gem2rpm.yml.documentation-custom_pkgs-instea.patch index 1a003fa..42376ec 100644 --- a/0012-typo-in-gem2rpm.yml.documentation-custom_pkgs-instea.patch +++ b/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 Date: Fri, 5 Dec 2014 17:16:41 +0200 -Subject: [PATCH 12/32] typo in gem2rpm.yml.documentation: :custom_pkgs: +Subject: [PATCH 12/33] typo in gem2rpm.yml.documentation: :custom_pkgs: instead of :custom: --- @@ -22,5 +22,5 @@ index 5e444eb..376eacd 100644 # :preamble: |- # Requires: ..... -- -2.20.1 +2.26.2 diff --git a/0013-Also-tag-LICENSE-MIT-as-docfile.patch b/0013-Also-tag-LICENSE-MIT-as-docfile.patch index 3be1a21..785f03c 100644 --- a/0013-Also-tag-LICENSE-MIT-as-docfile.patch +++ b/0013-Also-tag-LICENSE-MIT-as-docfile.patch @@ -1,7 +1,7 @@ From dad615aa35cbbe0d7351ea66af44a8548853a2da Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 12 Jan 2015 15:34:26 +0100 -Subject: [PATCH 13/32] Also tag LICENSE-MIT as docfile +Subject: [PATCH 13/33] 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.20.1 +2.26.2 diff --git a/0014-Refactor-into-multiple-lines.patch b/0014-Refactor-into-multiple-lines.patch index a8cb321..9a06529 100644 --- a/0014-Refactor-into-multiple-lines.patch +++ b/0014-Refactor-into-multiple-lines.patch @@ -1,7 +1,7 @@ From 5bb494a7d6911754e485f6b729861771181bf2a0 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 12 Jan 2015 15:51:08 +0100 -Subject: [PATCH 14/32] Refactor into multiple lines +Subject: [PATCH 14/33] 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.20.1 +2.26.2 diff --git a/0015-Add-licence-to-the-list-of-license-files-as-well.patch b/0015-Add-licence-to-the-list-of-license-files-as-well.patch index df58bbe..5b22229 100644 --- a/0015-Add-licence-to-the-list-of-license-files-as-well.patch +++ b/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 Date: Mon, 12 Jan 2015 15:52:34 +0100 -Subject: [PATCH 15/32] Add 'licence' to the list of license files as well +Subject: [PATCH 15/33] 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.20.1 +2.26.2 diff --git a/0016-add-two-more-ways-to-express-changes.patch b/0016-add-two-more-ways-to-express-changes.patch index bada849..a917d7a 100644 --- a/0016-add-two-more-ways-to-express-changes.patch +++ b/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 Date: Wed, 11 Feb 2015 02:05:31 +0100 -Subject: [PATCH 16/32] add two more ways to express changes +Subject: [PATCH 16/33] 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.20.1 +2.26.2 diff --git a/0017-.markdown-is-also-seen-in-the-wild.patch b/0017-.markdown-is-also-seen-in-the-wild.patch index ed91ee1..9adbe80 100644 --- a/0017-.markdown-is-also-seen-in-the-wild.patch +++ b/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 Date: Wed, 11 Feb 2015 02:30:14 +0100 -Subject: [PATCH 17/32] .markdown is also seen in the wild +Subject: [PATCH 17/33] .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.20.1 +2.26.2 diff --git a/0018-Only-use-the-extensions-doc-dir-on-MRI-2.1.x.patch b/0018-Only-use-the-extensions-doc-dir-on-MRI-2.1.x.patch index d6905dd..070249c 100644 --- a/0018-Only-use-the-extensions-doc-dir-on-MRI-2.1.x.patch +++ b/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?= Date: Fri, 13 Mar 2015 03:24:25 +0100 -Subject: [PATCH 18/32] Only use the extensions doc dir on MRI 2.1.x +Subject: [PATCH 18/33] 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.20.1 +2.26.2 diff --git a/0019-Cleaner-solution-for-the-extensions-doc-dir.patch b/0019-Cleaner-solution-for-the-extensions-doc-dir.patch index c71575a..4d939a9 100644 --- a/0019-Cleaner-solution-for-the-extensions-doc-dir.patch +++ b/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?= Date: Fri, 13 Mar 2015 14:53:04 +0100 -Subject: [PATCH 19/32] Cleaner solution for the extensions doc dir +Subject: [PATCH 19/33] 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.20.1 +2.26.2 diff --git a/0020-Ruby-1.8-insists-on-the-for-the-parameter.patch b/0020-Ruby-1.8-insists-on-the-for-the-parameter.patch index 495eec5..8191304 100644 --- a/0020-Ruby-1.8-insists-on-the-for-the-parameter.patch +++ b/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?= Date: Fri, 13 Mar 2015 15:06:01 +0100 -Subject: [PATCH 20/32] Ruby 1.8 insists on the () for the parameter +Subject: [PATCH 20/33] 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.20.1 +2.26.2 diff --git a/0021-Fix-company-name-in-copyright-header.patch b/0021-Fix-company-name-in-copyright-header.patch index e2cf4f4..6115351 100644 --- a/0021-Fix-company-name-in-copyright-header.patch +++ b/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?= Date: Thu, 16 Apr 2015 23:49:01 +0200 -Subject: [PATCH 21/32] Fix company name in copyright header +Subject: [PATCH 21/33] 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.20.1 +2.26.2 diff --git a/0022-add-the-touch-for-build-compare-to-the-template.patch b/0022-add-the-touch-for-build-compare-to-the-template.patch index 697794c..2ae6fcc 100644 --- a/0022-add-the-touch-for-build-compare-to-the-template.patch +++ b/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 Date: Wed, 6 Apr 2016 08:00:27 +0200 -Subject: [PATCH 22/32] add the touch for build-compare to the template +Subject: [PATCH 22/33] add the touch for build-compare to the template --- templates/opensuse.spec.erb | 1 + @@ -20,5 +20,5 @@ index 57bf9ff..22c4647 100644 <% end -%> -- -2.20.1 +2.26.2 diff --git a/0023-Also-tag-APACHE-LICENSE-2.0-as-docfile.patch b/0023-Also-tag-APACHE-LICENSE-2.0-as-docfile.patch index 3499db5..1b20d3c 100644 --- a/0023-Also-tag-APACHE-LICENSE-2.0-as-docfile.patch +++ b/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 Date: Mon, 18 Jul 2016 10:12:29 +0200 -Subject: [PATCH 23/32] Also tag APACHE-LICENSE-2.0 as docfile +Subject: [PATCH 23/33] 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.20.1 +2.26.2 diff --git a/0024-add-ability-to-provide-alternative-main-Source.patch b/0024-add-ability-to-provide-alternative-main-Source.patch index 02094dc..81107e1 100644 --- a/0024-add-ability-to-provide-alternative-main-Source.patch +++ b/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 Date: Tue, 23 Aug 2016 23:49:40 +0200 -Subject: [PATCH 24/32] add ability to provide alternative main Source +Subject: [PATCH 24/33] 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.20.1 +2.26.2 diff --git a/0025-allow-running-commands-after-patching.patch b/0025-allow-running-commands-after-patching.patch index e7c288b..b165afe 100644 --- a/0025-allow-running-commands-after-patching.patch +++ b/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?= Date: Thu, 10 Nov 2016 15:46:22 +0100 -Subject: [PATCH 25/32] allow running commands after patching +Subject: [PATCH 25/33] 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.20.1 +2.26.2 diff --git a/0026-use-https-instead-of-http-for-rubygems.org.patch b/0026-use-https-instead-of-http-for-rubygems.org.patch index 9f84e8d..bbe9ac2 100644 --- a/0026-use-https-instead-of-http-for-rubygems.org.patch +++ b/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?= Date: Thu, 10 Nov 2016 18:16:23 +0100 -Subject: [PATCH 26/32] use https instead of http for rubygems.org +Subject: [PATCH 26/33] 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.20.1 +2.26.2 diff --git a/0027-quote-version_suffix-in-gem2rpm.yml.documentation-to.patch b/0027-quote-version_suffix-in-gem2rpm.yml.documentation-to.patch index 7f64688..beab3c8 100644 --- a/0027-quote-version_suffix-in-gem2rpm.yml.documentation-to.patch +++ b/0027-quote-version_suffix-in-gem2rpm.yml.documentation-to.patch @@ -1,7 +1,7 @@ From 5ed4ebe4fce32e32c75019aa4ac01b78e22c2e44 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Fri, 3 Nov 2017 14:46:39 +0100 -Subject: [PATCH 27/32] quote version_suffix in gem2rpm.yml.documentation to +Subject: [PATCH 27/33] quote version_suffix in gem2rpm.yml.documentation to avoid wrong package names --- @@ -22,5 +22,5 @@ index fbed82e..bb4893d 100644 # :disable_docs: true # ## used by gem2rpm -- -2.20.1 +2.26.2 diff --git a/0028-add-binary_map-support.patch b/0028-add-binary_map-support.patch index c8a6c87..4aa429e 100644 --- a/0028-add-binary_map-support.patch +++ b/0028-add-binary_map-support.patch @@ -1,7 +1,7 @@ From fdf7e5ceb4c165babfb7486fe6640faa21ab5e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= Date: Wed, 6 Jun 2018 16:15:39 +0200 -Subject: [PATCH 28/32] add binary_map support +Subject: [PATCH 28/33] add binary_map support --- gem2rpm.yml.documentation | 2 ++ @@ -37,7 +37,7 @@ index 6add6a7..4861bbd 100644 + end + def self.filecontent_or_value(path) - (path and File.exist?(path)) ? File.read(path) : path + (path and File.exists?(path)) ? File.read(path) : path end @@ -93,6 +100,7 @@ Group: Development/Languages/Ruby <% unless spec.executables.empty? -%> @@ -85,5 +85,5 @@ index 6add6a7..4861bbd 100644 %ghost <%= rb_sysconfdir %>/alternatives/<%= "#{executable}-#{spec.version}" %> <% end -%> -- -2.20.1 +2.26.2 diff --git a/0029-Use-or-for-the-conditions-instead-of-and.patch b/0029-Use-or-for-the-conditions-instead-of-and.patch index 97d086e..d1c6e23 100644 --- a/0029-Use-or-for-the-conditions-instead-of-and.patch +++ b/0029-Use-or-for-the-conditions-instead-of-and.patch @@ -1,7 +1,7 @@ From 04d2ef0c24748dd4120d1cc3a7b08d5c963dc100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= Date: Wed, 6 Jun 2018 16:40:15 +0200 -Subject: [PATCH 29/32] Use "or" for the conditions instead of and +Subject: [PATCH 29/33] Use "or" for the conditions instead of and --- templates/gem_packages.spec.erb | 3 ++- @@ -22,5 +22,5 @@ index 4861bbd..b704b91 100644 end executable -- -2.20.1 +2.26.2 diff --git a/0030-gem_package.spec.erb-sync-with-ruby-common.patch b/0030-gem_package.spec.erb-sync-with-ruby-common.patch index b89cb12..ddbf5fa 100644 --- a/0030-gem_package.spec.erb-sync-with-ruby-common.patch +++ b/0030-gem_package.spec.erb-sync-with-ruby-common.patch @@ -1,7 +1,7 @@ From c4557ce4aa7e0f67e5c249c255fe0c0c5df8f793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcus=20R=C3=BCckert?= Date: Wed, 6 Jun 2018 17:15:35 +0200 -Subject: [PATCH 30/32] gem_package.spec.erb: sync with ruby-common +Subject: [PATCH 30/33] gem_package.spec.erb: sync with ruby-common Also drop the Enhances change that sneaked in by accident --- @@ -73,5 +73,5 @@ index b704b91..257c719 100644 <% if data[:description] and data[:description] != '' -%> <%= data[:description] %> -- -2.20.1 +2.26.2 diff --git a/0031-use-template-opensuse-on-openSUSE-Tumbleweed-where-e.patch b/0031-use-template-opensuse-on-openSUSE-Tumbleweed-where-e.patch index 6de62e8..5de9108 100644 --- a/0031-use-template-opensuse-on-openSUSE-Tumbleweed-where-e.patch +++ b/0031-use-template-opensuse-on-openSUSE-Tumbleweed-where-e.patch @@ -1,7 +1,7 @@ From 7fa4f56a2a55278e95510d1663c495fa733d7780 Mon Sep 17 00:00:00 2001 From: Johannes Kastl Date: Sat, 21 Jul 2018 23:13:35 +0200 -Subject: [PATCH 31/32] use template opensuse on openSUSE Tumbleweed, where +Subject: [PATCH 31/33] use template opensuse on openSUSE Tumbleweed, where /etc/os-release contains ID="opensuse-tumbleweed" --- @@ -24,5 +24,5 @@ index 45ed21c..1298798 100755 if template_file.nil? template = Gem2Rpm::TEMPLATE -- -2.20.1 +2.26.2 diff --git a/0032-Replace-no-rdoc-no-ri-with-no-document.patch b/0032-Replace-no-rdoc-no-ri-with-no-document.patch index 4b23626..ab6d2d9 100644 --- a/0032-Replace-no-rdoc-no-ri-with-no-document.patch +++ b/0032-Replace-no-rdoc-no-ri-with-no-document.patch @@ -1,7 +1,7 @@ From 9adb19584120941300dc8269f6a8563eb85b1a1c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 23 Feb 2019 07:45:40 +0100 -Subject: [PATCH 32/32] Replace --no-rdoc --no-ri with --no-document +Subject: [PATCH 32/33] Replace --no-rdoc --no-ri with --no-document --- templates/opensuse.spec.erb | 2 +- @@ -21,5 +21,5 @@ index b070745..4bcc224 100644 <% unless spec.executables.empty? -%> --symlink-binaries \ -- -2.20.1 +2.26.2 diff --git a/0033-Use-File.exist-instead-of-File.exists-which-was-remo.patch b/0033-Use-File.exist-instead-of-File.exists-which-was-remo.patch new file mode 100644 index 0000000..c585b2f --- /dev/null +++ b/0033-Use-File.exist-instead-of-File.exists-which-was-remo.patch @@ -0,0 +1,65 @@ +From a55b215427daffb082518545a4617bf04ce013bf Mon Sep 17 00:00:00 2001 +From: Martin Vidner +Date: Wed, 7 Dec 2022 11:05:25 +0100 +Subject: [PATCH 33/33] Use File.exist? instead of File.exists? which was + removed in Ruby 3.2 + +https://www.ruby-lang.org/en/news/2022/12/06/ruby-3-2-0-rc1-released/ + +> Removed methods +> +> The following deprecated methods are removed. +> - ... +> - File.exists? [Feature 17391] +--- + bin/gem2rpm | 6 +++--- + templates/gem_packages.spec.erb | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/bin/gem2rpm b/bin/gem2rpm +index 1298798..059e953 100755 +--- a/bin/gem2rpm ++++ b/bin/gem2rpm +@@ -74,7 +74,7 @@ rest = opts.permute(ARGV) + + template = nil + if template_file.nil? +- f = open("/etc/os-release", "r") if File.exists?("/etc/os-release") ++ f = open("/etc/os-release", "r") if File.exist?("/etc/os-release") + if f + f.read.split('\n').each do |line| + line.match(%r{^ID=(.*)$}) { |m| template_file=m[1] } +@@ -91,7 +91,7 @@ if template_file.nil? + template = Gem2Rpm::TEMPLATE + else + begin +- f = open(template_file, "r") if File.exists?(template_file) ++ f = open(template_file, "r") if File.exist?(template_file) + f = open(File.join(Gem2Rpm.template_dir, template_file + '.spec.erb'), "r") unless f + rescue Errno::ENOENT + $stderr.puts "Could not open template #{template_file}. Aborting" +@@ -154,7 +154,7 @@ if output_file.nil? + Gem2Rpm::convert(gemfile, template, $stdout, nongem, local, doc_subpackage, oldlicense, config) unless deps + else + begin +- if File.exists?(output_file) ++ if File.exist?(output_file) + File.open(output_file, 'r') do |oldfile| + oldfile.each_line do |line| + m = line.match(%r{^License:\s*(\w.*)$}) +diff --git a/templates/gem_packages.spec.erb b/templates/gem_packages.spec.erb +index 257c719..4f9447c 100644 +--- a/templates/gem_packages.spec.erb ++++ b/templates/gem_packages.spec.erb +@@ -39,7 +39,7 @@ + end + + def self.filecontent_or_value(path) +- (path and File.exists?(path)) ? File.read(path) : path ++ (path and File.exist?(path)) ? File.read(path) : path + end + + def self.parse_custom_pkgs(env_value) +-- +2.26.2 + diff --git a/rubygem-gem2rpm.changes b/rubygem-gem2rpm.changes index dcd3ada..190ee00 100644 --- a/rubygem-gem2rpm.changes +++ b/rubygem-gem2rpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Dec 7 11:24:45 UTC 2022 - Martin Vidner + +- Use git format-patch instead, fixing one more exists? occurrence +- Note 0004-added-example-gem2rpm.yml.patch has the Rakefile hunk removed + ------------------------------------------------------------------- Mon Dec 5 16:25:59 UTC 2022 - Martin Vidner diff --git a/rubygem-gem2rpm.spec b/rubygem-gem2rpm.spec index b512a3b..ab242b3 100644 --- a/rubygem-gem2rpm.spec +++ b/rubygem-gem2rpm.spec @@ -88,6 +88,7 @@ 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 +Patch33: 0033-Use-File.exist-instead-of-File.exists-which-was-remo.patch Patch128: template_loader.patch Summary: Generate rpm specfiles from gems License: GPL-2.0-or-later @@ -133,6 +134,7 @@ The spec file tries to follow the gem as closely as possible %patch30 -p1 %patch31 -p1 %patch32 -p1 +%patch33 -p1 %patch128 -p1 %build