forked from pool/rubygem-gem2rpm
- added 0009-No-longer-require-the-ruby-version-inside-the-subpac.patch
No longer require the ruby version inside the subpackage With the buildrequires we already make sure that the package is only built if we find a recent enough ABI. then the normal $interpreter(abi) requires generated by rpm is enough OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/rubygem-gem2rpm?expand=0&rev=9
This commit is contained in:
Git OBS Bridge
parent
ec53805b8a
commit
3240fc8261
@ -1,7 +1,7 @@
|
||||
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
|
||||
Subject: [PATCH 1/9] - use the ID from os-release to use the proper template
|
||||
|
||||
---
|
||||
bin/gem2rpm | 10 ++++++++++
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 1742038eb7ec8fcb25009ce8b270b420183875bc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de>
|
||||
Date: Thu, 24 Jul 2014 16:54:45 +0200
|
||||
Subject: [PATCH 2/8] added basic config file support to gem2rpm in yaml
|
||||
Subject: [PATCH 2/9] added basic config file support to gem2rpm in yaml
|
||||
format.
|
||||
|
||||
There is no validation as it is basically a hash where certain keys are
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From 5e1e30e5addc99825b3bf873983ca48732493060 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de>
|
||||
Date: Thu, 24 Jul 2014 16:55:57 +0200
|
||||
Subject: [PATCH 3/8] new opensuse templates. they require the config file
|
||||
Subject: [PATCH 3/9] new opensuse templates. they require the config file
|
||||
support.
|
||||
|
||||
---
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From f408e57b282cd55d59c1317240ee9e0dc679373c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de>
|
||||
Date: Thu, 24 Jul 2014 17:02:56 +0200
|
||||
Subject: [PATCH 4/8] added example gem2rpm.yml
|
||||
Subject: [PATCH 4/9] added example gem2rpm.yml
|
||||
|
||||
---
|
||||
Rakefile | 2 +-
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From da07cd470611c3c6b70fc863e2d82a2862a068e4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <mrueckert@suse.de>
|
||||
Date: Thu, 24 Jul 2014 17:09:35 +0200
|
||||
Subject: [PATCH 5/8] properly shorten description and summary
|
||||
Subject: [PATCH 5/9] properly shorten description and summary
|
||||
|
||||
This also includes the description if we reuse the summary.
|
||||
---
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
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 6/8] Preserve the license header found in the output file
|
||||
Subject: [PATCH 6/9] Preserve the license header found in the output file
|
||||
|
||||
---
|
||||
bin/gem2rpm | 13 +++++++++++--
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From eed51b54253c303c593d9466ed8ed17523bda3d1 Mon Sep 17 00:00:00 2001
|
||||
From: Stephan Kulow <coolo@suse.de>
|
||||
Date: Wed, 15 Oct 2014 10:38:29 +0200
|
||||
Subject: [PATCH 7/8] fixes for the opensuse template:
|
||||
Subject: [PATCH 7/9] fixes for the opensuse template:
|
||||
|
||||
- add one more space for sources
|
||||
- add empty lines in front of the warning preamble - otherwise format_spec_file
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From ba7932c7d7bc6a70a45ac6ebb841a9e1bf8bb86b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
|
||||
Date: Tue, 21 Oct 2014 14:54:55 +0200
|
||||
Subject: [PATCH 8/8] do not use not(). not supported on 1.8 e.g.
|
||||
Subject: [PATCH 8/9] do not use not(). not supported on 1.8 e.g.
|
||||
|
||||
---
|
||||
templates/gem_packages.spec.erb | 4 ++--
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
From 13b02a1596a744ed70687dae0ffb465e1979221e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Marcus=20R=C3=BCckert?= <darix@nordisch.org>
|
||||
Date: Tue, 21 Oct 2014 15:13:31 +0200
|
||||
Subject: [PATCH 9/9] No longer require the ruby version inside the subpackage
|
||||
|
||||
With the buildrequires we already make sure that the package is only
|
||||
built if we find a recent enough ABI. then the normal $interpreter(abi)
|
||||
requires generated by rpm is enough
|
||||
---
|
||||
templates/gem_packages.spec.erb | 5 -----
|
||||
1 file changed, 5 deletions(-)
|
||||
|
||||
diff --git a/templates/gem_packages.spec.erb b/templates/gem_packages.spec.erb
|
||||
index 94d4005..29873e5 100644
|
||||
--- a/templates/gem_packages.spec.erb
|
||||
+++ b/templates/gem_packages.spec.erb
|
||||
@@ -77,11 +77,6 @@
|
||||
#/ruby2.1
|
||||
%>
|
||||
%package -n <%= pkg_basename %><%= config[:version_suffix] %>
|
||||
-<% for req in spec.required_ruby_version -%>
|
||||
-<% unless req.empty? -%>
|
||||
-Requires: <%= rb_pkgname %> <%= req %>
|
||||
-<% end -%>
|
||||
-<% end -%>
|
||||
# MANUAL
|
||||
<% if config[:main] && config[:main][:preamble] -%>
|
||||
<%= config[:main][:preamble] %>
|
||||
--
|
||||
1.8.4.5
|
||||
|
||||
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 21 13:15:04 UTC 2014 - mrueckert@suse.de
|
||||
|
||||
- added 0009-No-longer-require-the-ruby-version-inside-the-subpac.patch
|
||||
No longer require the ruby version inside the subpackage
|
||||
|
||||
With the buildrequires we already make sure that the package is
|
||||
only built if we find a recent enough ABI. then the normal
|
||||
$interpreter(abi) requires generated by rpm is enough
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 21 13:06:09 UTC 2014 - mrueckert@suse.de
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user