Marcus Rueckert
ec53805b8a
M 0001-use-the-ID-from-os-release-to-use-the-proper-templat.patch M 0002-added-basic-config-file-support-to-gem2rpm-in-yaml-f.patch A 0003-new-opensuse-templates.-they-require-the-config-file.patch A 0004-added-example-gem2rpm.yml.patch A 0005-properly-shorten-description-and-summary.patch A 0006-Preserve-the-license-header-found-in-the-output-file.patch A 0007-fixes-for-the-opensuse-template.patch A 0008-do-not-use-not-.-not-supported-on-1.8-e.g.patch D 0003-sle-12-templates.-they-require-the-config-file-suppo.patch D 0004-openSUSE-template-fixes.patch D 0005-added-example-gem2rpm.yml.patch D 0006-properly-shorten-description-and-summary.patch D 0007-Preserve-the-license-header-found-in-the-output-file.patch D 0008-dont-allow-suffixes-with-just-a-plain-number.-prefix.patch D 0009-rubinius-has-no-extensions-docdir.patch D 0010-switch-to-new-packaging-scheme-by-default.patch D 0011-fixes-for-the-opensuse-template.patch - new patch for fixing usage of not() which breaks on 1.8 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/rubygem-gem2rpm?expand=0&rev=8
34 lines
814 B
Diff
34 lines
814 B
Diff
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 1/8] - use the ID from os-release to use the proper template
|
|
|
|
---
|
|
bin/gem2rpm | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
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)
|
|
|
|
template = 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|
|
|
+ line.match(%r{^ID=(.*)$}) { |m| template_file=m[1] }
|
|
+ end
|
|
+ f.close
|
|
+ f = nil
|
|
+ end
|
|
+end
|
|
+if template_file.nil?
|
|
template = Gem2Rpm::TEMPLATE
|
|
else
|
|
begin
|
|
--
|
|
1.8.4.5
|
|
|