From d8747ce2374f8efced0fd1deab4b19a9b1f82e42 Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Sep 06 2012 07:05:56 +0000 Subject: Fixed Fedora 18 mass rebuild issue. --- diff --git a/rubygems-1.8.5-all-load-paths.patch b/rubygems-1.8.5-all-load-paths.patch deleted file mode 100644 index 470ddbf..0000000 --- a/rubygems-1.8.5-all-load-paths.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- rubygems-1.8.5/lib/rubygems.rb.all_load_paths 2011-06-25 13:57:51.000000000 +0900 -+++ rubygems-1.8.5/lib/rubygems.rb 2011-06-25 15:03:26.000000000 +0900 -@@ -258,7 +258,8 @@ - - Gem.path.each do |gemdir| - each_load_path all_partials(gemdir) do |load_path| -- result << gemdir.add(load_path).expand_path -+# result << gemdir.add(load_path).expand_path -+ result << load_path - end - end - diff --git a/rubygems-1.8.5-noarch-gemdir.patch b/rubygems-1.8.5-noarch-gemdir.patch deleted file mode 100644 index 3829a78..0000000 --- a/rubygems-1.8.5-noarch-gemdir.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- rubygems-1.8.5/lib/rubygems/defaults.rb.noarch 2011-05-19 08:36:37.000000000 +0900 -+++ rubygems-1.8.5/lib/rubygems/defaults.rb 2011-06-01 23:46:49.000000000 +0900 -@@ -33,10 +33,12 @@ - ] - else - [ -- ConfigMap[:libdir], -- ruby_engine, -- 'gems', -- ConfigMap[:ruby_version] -+ File::expand_path(File::join(ConfigMap[:sitedir],"..","gems")), -+ ConfigMap[:ruby_version] -+# ConfigMap[:libdir], -+# ruby_engine, -+# 'gems', -+# ConfigMap[:ruby_version] - ] - end - diff --git a/rubygems-1.8.8-revert-to-git-tree.patch b/rubygems-1.8.8-revert-to-git-tree.patch deleted file mode 100644 index 6437a34..0000000 --- a/rubygems-1.8.8-revert-to-git-tree.patch +++ /dev/null @@ -1,32 +0,0 @@ -Only in rubygems-1.8.8/./: .gemtest -Only in git/rubygems/: .git -Only in git/rubygems/: .gitignore -diff -ur rubygems-1.8.8/./lib/rubygems/commands/fetch_command.rb git/rubygems/lib/rubygems/commands/fetch_command.rb ---- rubygems-1.8.8/./lib/rubygems/commands/fetch_command.rb 2011-08-12 09:11:38.000000000 +0900 -+++ git/rubygems/lib/rubygems/commands/fetch_command.rb 2011-08-20 16:54:40.000000000 +0900 -@@ -58,7 +58,8 @@ - next - end - -- Gem::RemoteFetcher.fetcher.download spec, source_uri, Dir.pwd -+ path = Gem::RemoteFetcher.fetcher.download spec, source_uri -+ FileUtils.mv path, File.basename(spec.cache_file) - - say "Downloaded #{spec.full_name}" - end -diff -ur rubygems-1.8.8/./lib/rubygems/remote_fetcher.rb git/rubygems/lib/rubygems/remote_fetcher.rb ---- rubygems-1.8.8/./lib/rubygems/remote_fetcher.rb 2011-08-12 09:11:38.000000000 +0900 -+++ git/rubygems/lib/rubygems/remote_fetcher.rb 2011-08-20 16:54:40.000000000 +0900 -@@ -98,9 +98,7 @@ - def download(spec, source_uri, install_dir = Gem.dir) - Gem.ensure_gem_subdirectories(install_dir) rescue nil - -- if Dir.pwd == install_dir then -- cache_dir = install_dir -- elsif File.writable?(install_dir) -+ if File.writable?(install_dir) - cache_dir = File.join install_dir, "cache" - else - cache_dir = File.join Gem.user_dir, "cache" -Only in rubygems-1.8.8/./: rubygems-update-1.8.8 -Only in git/rubygems/: tmp2.patch diff --git a/rubygems.spec b/rubygems.spec index 5eadf81..207cbee 100644 --- a/rubygems.spec +++ b/rubygems.spec @@ -8,17 +8,25 @@ # Specify custom RubyGems root and other related macros. %global gem_dir %{_datadir}/gems -# TODO: Should we create arch specific rubygems-filesystem? +# TODO: These folders should go into rubygem-filesystem but how to achieve it, +# since noarch package cannot provide arch dependent subpackages? +# http://rpm.org/ticket/78 %global gem_extdir %{_exec_prefix}/lib{,64}/gems # Executing testsuite (enabling %%check section) will cause dependency loop. # To avoid dependency loop when necessary, please set the following value to 0 %global enable_check 1 +# It cannot be relied on %%{_libdir} for noarch packages. Query Ruby for +# the right value. +# https://fedorahosted.org/rel-eng/ticket/5257 +%{!?buildtime_libdir:%global buildtime_libdir $(ruby -rrbconfig -e 'puts RbConfig::CONFIG["libdir"]')} + + Summary: The Ruby standard for packaging ruby libraries Name: rubygems Version: 1.8.24 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Libraries License: Ruby or MIT @@ -158,9 +166,9 @@ touch lib/rubygems/defaults/operating_system.rb # It is necessary to specify the paths using RUBYOPT to let the test suite pass." export GEM_PATH=%{gem_dir} RUBYOPT="-Itest -Ilib" -RUBYOPT="$RUBYOPT -I%{_libdir}/gems/exts/io-console-0.3/lib/" +RUBYOPT="$RUBYOPT -I%{buildtime_libdir}/gems/exts/io-console-0.3/lib/" # In case that rubygem-json is installed -RUBYOPT="$RUBYOPT -I%{gem_dir}/gems/json-1.6.5/lib -I%{_libdir}/gems/exts/json-1.6.5/ext/json/ext" +RUBYOPT="$RUBYOPT -I%{gem_dir}/gems/json-1.6.5/lib -I%{buildtime_libdir}/gems/exts/json-1.6.5/ext/json/ext" export RUBYOPT testrb test @@ -193,6 +201,9 @@ testrb test %config(noreplace) %{_sysconfdir}/rpm/macros.rubygems %changelog +* Wed Sep 05 2012 Vít Ondruch - 1.8.24-2 +- Fixed Fedora 18 mass rebuild issue. + * Sat Apr 28 2012 Mamoru Tasaka - 1.8.24-1 - 1.8.24