Marcus Rueckert
2c88c1595d
- dropped all patches and replaced them with git format-patch
series:
- modified:
0001-use-the-ID-from-os-release-to-use-the-proper-templat.patch
0002-added-basic-config-file-support-to-gem2rpm-in-yaml-f.patch
0003-new-opensuse-templates.-they-require-the-config-file.patch
0004-added-example-gem2rpm.yml.patch
0005-properly-shorten-description-and-summary.patch
0006-Preserve-the-license-header-found-in-the-output-file.patch
0007-fixes-for-the-opensuse-template.patch
0008-do-not-use-not-.-not-supported-on-1.8-e.g.patch
0009-No-longer-require-the-ruby-version-inside-the-subpac.patch
0010-Try-to-load-rbconfigpackagingsupport-and-fail-gracef.patch
0011-Add-support-for-scripts-pre-post-for-subpackages.patch
0012-typo-in-gem2rpm.yml.documentation-custom_pkgs-instea.patch
0013-Also-tag-LICENSE-MIT-as-docfile.patch
0014-Refactor-into-multiple-lines.patch
0015-Add-licence-to-the-list-of-license-files-as-well.patch
0016-add-two-more-ways-to-express-changes.patch
- dropped:
0017-touch-unpacked-sources.patch
0001-Also-tag-APACHE-LICENSE-2.0-as-docfile.patch
- newly added:
0017-.markdown-is-also-seen-in-the-wild.patch
0018-Only-use-the-extensions-doc-dir-on-MRI-2.1.x.patch
0019-Cleaner-solution-for-the-extensions-doc-dir.patch
0020-Ruby-1.8-insists-on-the-for-the-parameter.patch
0021-Fix-company-name-in-copyright-header.patch
OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/rubygem-gem2rpm?expand=0&rev=20
31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
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/25] Cleaner solution for the extensions doc dir
|
|
|
|
The other solution was also failing on 1.8
|
|
---
|
|
templates/gem_packages.spec.erb | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/templates/gem_packages.spec.erb b/templates/gem_packages.spec.erb
|
|
index 80e552e..661539a 100644
|
|
--- a/templates/gem_packages.spec.erb
|
|
+++ b/templates/gem_packages.spec.erb
|
|
@@ -14,10 +14,8 @@
|
|
end
|
|
|
|
def self.get_extension_doc_dir(gem_spec)
|
|
- # TODO: This is kinda ugly but it does the job for now.
|
|
- rv = Gem::Version.new(RUBY_VERSION)
|
|
- return nil unless RUBY_ENGINE=='ruby' && (Gem::Version.new('2.2.0') > rv && rv > Gem::Version.new('2.1.0'))
|
|
- if gem_spec.respond_to?(:extensions_dir) && RUBY_ENGINE != 'rbx'
|
|
+ return nil unless Gem.ruby_engine == 'ruby' && Gem::Requirement.new("~> 2.1.0").satisfied_by? Gem.ruby_version
|
|
+ if gem_spec.respond_to?(:extensions_dir)
|
|
rp = gem_spec.extensions_dir.rpartition(gem_spec.base_dir)
|
|
return File.join(rp[1], 'doc', rp[2])
|
|
end
|
|
--
|
|
2.10.1
|
|
|