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
59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
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/25] 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.10.1
|
|
|