From 75d1c0de7ca8aaa30809b5510e35ac47c0c8a9bafe0c67341d2ddb29549c0590 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Tue, 1 Mar 2016 01:05:13 +0000 Subject: [PATCH] - Since rubygems 2.5.0 the default version in the gem bin stub changed from '>= 0' to '>= 0.a'. This was done to allow prerelease versions. Our patching script didn't take the '.a' into account and generated version fields like '= 0.10.1.a' instead of the expected '= 0.10.1'. This fix accounts for the '.a'. OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/ruby-common?expand=0&rev=91 --- gem_install.sh | 2 +- ruby-common.changes | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gem_install.sh b/gem_install.sh index cd533c4..4683eef 100644 --- a/gem_install.sh +++ b/gem_install.sh @@ -206,7 +206,7 @@ if options.symlinkbinaries && File.exists?(bindir) ruby_versioned = "#{unversioned}#{options.rubysuffix}" gem_versioned = "#{unversioned}-#{spec.version}" File.rename(default_path, full_versioned) - patchfile(full_versioned, />= 0/, "= #{options.gemversion}") + patchfile(full_versioned, />= 0(\.a)?/, "= #{options.gemversion}") # unversioned [unversioned, ruby_versioned, gem_versioned].each do |linkname| full_path = File.join(br_ua_dir, linkname) diff --git a/ruby-common.changes b/ruby-common.changes index 184f03b..da4171f 100644 --- a/ruby-common.changes +++ b/ruby-common.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Mar 1 01:01:56 UTC 2016 - mrueckert@suse.de + +- Since rubygems 2.5.0 the default version in the gem bin stub + changed from '>= 0' to '>= 0.a'. This was done to allow + prerelease versions. Our patching script didn't take the '.a' + into account and generated version fields like '= 0.10.1.a' + instead of the expected '= 0.10.1'. This fix accounts for the + '.a'. + ------------------------------------------------------------------- Thu Jun 11 14:33:37 UTC 2015 - lnussel@suse.de