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
62 lines
2.1 KiB
Diff
62 lines
2.1 KiB
Diff
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/25] Preserve the license header found in the output file
|
|
|
|
---
|
|
bin/gem2rpm | 13 +++++++++++--
|
|
lib/gem2rpm.rb | 5 ++++-
|
|
2 files changed, 15 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/bin/gem2rpm b/bin/gem2rpm
|
|
index 7f28603..8a6db05 100755
|
|
--- a/bin/gem2rpm
|
|
+++ b/bin/gem2rpm
|
|
@@ -145,12 +145,21 @@ if config_file
|
|
end
|
|
|
|
# Produce a specfile
|
|
+oldlicense = nil
|
|
if output_file.nil?
|
|
- Gem2Rpm::convert(gemfile, template, $stdout, nongem, local, doc_subpackage, config) unless deps
|
|
+ Gem2Rpm::convert(gemfile, template, $stdout, nongem, local, doc_subpackage, oldlicense, config) unless deps
|
|
else
|
|
begin
|
|
+ if File.exists?(output_file)
|
|
+ File.open(output_file, 'r') do |oldfile|
|
|
+ oldfile.each_line do |line|
|
|
+ m = line.match(%r{^License:\s*(\w.*)$})
|
|
+ oldlicense = m[1] if m
|
|
+ end
|
|
+ end
|
|
+ end
|
|
out = open(output_file, "w")
|
|
- Gem2Rpm::convert(gemfile, template, out, nongem, local, doc_subpackage, config)
|
|
+ Gem2Rpm::convert(gemfile, template, out, nongem, local, doc_subpackage, oldlicense, config)
|
|
ensure
|
|
out.close()
|
|
end
|
|
diff --git a/lib/gem2rpm.rb b/lib/gem2rpm.rb
|
|
index 5261ae1..d30e0f6 100644
|
|
--- a/lib/gem2rpm.rb
|
|
+++ b/lib/gem2rpm.rb
|
|
@@ -31,11 +31,14 @@ module Gem2Rpm
|
|
end
|
|
|
|
def Gem2Rpm.convert(fname, template=TEMPLATE, out=$stdout,
|
|
- nongem=true, local=false, doc_subpackage = true, config={})
|
|
+ nongem=true, local=false, doc_subpackage = true, oldlicense=nil, config={})
|
|
package = Gem2Rpm::Package.new(fname)
|
|
# Deprecate, kept just for backward compatibility.
|
|
format = Gem2Rpm::Format.new(package)
|
|
spec = Gem2Rpm::Specification.new(package.spec)
|
|
+ if spec.licenses.empty? && oldlicense
|
|
+ spec.licenses = oldlicense.split(' and ')
|
|
+ end
|
|
config ||= {}
|
|
download_path = ""
|
|
unless local
|
|
--
|
|
2.10.1
|
|
|