rpms/ruby
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixes multilib conlicts of .gemspec files.

Browse Source
This commit is contained in:
Vít Ondruch 2013-07-11 11:02:00 +02:00
parent 7a3d8e78c6
commit 8ed2f329ec
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ruby-2.0.0-p247-Make-stable-Gem-Specification.files-in-default-.gems.patch Normal file
View File

@ -0,0 +1,28 @@
From fb9fcc8b01d968c62577756cbfd00f20a10b5cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
Date: Tue, 9 Jul 2013 12:32:49 +0200
Subject: [PATCH] Make stable Gem::Specification.files in default .gemspecs
Although the .gemspec files for default gems are same in function, the
different order of their "s.files" makes them different therefore
possibly conflicting in multilib scenario.
---
tool/rbinstall.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 1063fac..fb2fcee 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -592,7 +592,7 @@ module RbInstall
end
def collect
- ruby_libraries + built_libraries
+ (ruby_libraries + built_libraries).sort
end
private
--
1.8.3.1

9
ruby.spec
View File

@ -26,7 +26,7 @@
%endif
%global release 12
%global release 13
%{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
%global rubygems_version 2.0.3
@ -157,6 +157,9 @@ Patch17: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
# Fixes issues with DESTDIR.
# https://bugs.ruby-lang.org/issues/8115
Patch18: ruby-2.0.0-p247-Revert-mkmf.rb-prefix-install_dirs-only-with-DESTDIR.patch
# Fixes multilib conlicts of .gemspec files.
# https://bugs.ruby-lang.org/issues/8623
Patch19: ruby-2.0.0-p247-Make-stable-Gem-Specification.files-in-default-.gems.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: ruby(rubygems) >= %{rubygems_version}
@ -423,6 +426,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby.
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
# Provide an example of usage of the tapset:
cp -a %{SOURCE3} .
@ -882,6 +886,9 @@ make check TESTS="-v $DISABLE_TESTS"
%{ruby_libdir}/tkextlib
%changelog
* Thu Jul 11 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.247-13
- Fixes multilib conlicts of .gemspec files.
* Thu Jul 04 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.247-12
- Fix RubyGems search paths when building gems with native extension
(rhbz#979133).