[rubygem-bundler] Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0 Update to Bundler 1.3.1

[Vít Ondruch]

commit 6306b4d45e57b7438672afc3212016d51036e2ae
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Thu Mar 7 10:47:07 2013 +0100

    Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
    Update to Bundler 1.3.1

 .gitignore           |    1 +
 rubygem-bundler.spec |   49 +++++++++++++++++++++++++++++++++----------------
 sources              |    2 +-
 3 files changed, 35 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index afbc009..8dabb7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /bundler-1.0.21.gem
 /bundler-1.1.4.gem
 /bundler-1.2.1.gem
+/bundler-1.3.1.gem
diff --git a/rubygem-bundler.spec b/rubygem-bundler.spec
index 04f6abf..a6fccd4 100644
--- a/rubygem-bundler.spec
+++ b/rubygem-bundler.spec
@@ -1,32 +1,30 @@
 %global gem_name bundler
-%global rubyabi 1.9.1
-
-%global rdoc_version 3.12
-%global json_version 1.6.5
 
 %{!?enable_test: %global enable_test 0}
 
 Summary: Library and utilities to manage a Ruby application's gem dependencies
 Name: rubygem-%{gem_name}
-Version: 1.2.1
-Release: 2%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://gembundler.com
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 Patch1: bundler-add-support-for-binary-extensions-in-dedicated-folde.patch
-Requires: ruby(abi) = %{rubyabi}
+Requires: ruby(release)
 Requires: ruby(rubygems)
 Requires: rubygem(thor)
 Requires: rubygem(net-http-persistent)
-BuildRequires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby
 %if 0%{enable_test} > 0
+Patch100: rubygem-bundler-1.3.1-Fix-gem_helper_spec.patch
 BuildRequires: ruby-devel
 BuildRequires: rubygem(thor)
 BuildRequires: rubygem(net-http-persistent)
 BuildRequires: rubygem(rspec)
+BuildRequires: rubygem(psych)
 BuildRequires: git sudo
 %endif
 BuildArch: noarch
@@ -47,10 +45,7 @@ Documentation for %{name}
 
 %prep
 %setup -q -c -T
-mkdir -p .%{gem_dir}
-gem install --local --install-dir .%{gem_dir} \
-            --bindir .%{_bindir} \
-            --force %{SOURCE0}
+%gem_install -n %{SOURCE0}
 
 pushd .%{gem_instdir}
 %patch1 -p1
@@ -90,13 +85,29 @@ done
 %check
 pushd .%{gem_instdir}
 
+# This test does not work, since ruby is configured with --with-ruby-version=''
+# https://github.com/carlhuda/bundler/issues/2365
+sed -i '/"works after switching Rubies"/,/end$/{s/^/#/}' spec/install/gems/platform_spec.rb
+
+# Fixes not correctly initialized git repo.
+# https://github.com/carlhuda/bundler/pull/2367
+cat %{PATCH100} | patch -p1
+
 # Test suite needs to run in initialized git repository.
 # https://github.com/carlhuda/bundler/issues/2022
 git init
 
-# LANG=en_US.utf-8 prevents test suite failure caused by RubyGems issue:
-# https://github.com/rubygems/rubygems/issues/314
-LANG=en_US.utf-8 RUBYOPT="-I%{gem_dir}/gems/json-%{json_version}/lib -I%{_libdir}/gems/exts/json-%{json_version}/ext/json/ext -I%{gem_dir}/gems/rdoc-%{rdoc_version}/lib" rspec spec/
+# There is necessary to specify load paths for several gems to pass the test
+# suite. Let's evaluate them by this nice Ruby snippet.
+RUBYOPT=-I`ruby <<EOF
+  specs = %w{json rdoc psych}.map {|g| Gem::Specification.find_by_name(g)}
+  specs.map! do |s|
+    paths = [s.gem_dir]
+    paths << s.ext_dir unless s.extensions.empty?
+    paths.map {|p| File.join p, s.require_paths.first}
+  end
+  puts specs.join(':')
+EOF` rspec spec/
 
 %endif
 
@@ -105,7 +116,7 @@ LANG=en_US.utf-8 RUBYOPT="-I%{gem_dir}/gems/json-%{json_version}/lib -I%{_libdir
 %exclude %{gem_instdir}/.*
 %exclude %{gem_instdir}/man
 %{gem_libdir}
-%doc %{gem_instdir}/LICENSE
+%doc %{gem_instdir}/LICENSE.md
 %{gem_instdir}/.travis.yml
 %{_bindir}/bundle
 %{gem_instdir}/bin
@@ -119,12 +130,18 @@ LANG=en_US.utf-8 RUBYOPT="-I%{gem_dir}/gems/json-%{json_version}/lib -I%{_libdir
 %doc %{gem_instdir}/ISSUES.md
 %doc %{gem_instdir}/README.md
 %doc %{gem_instdir}/UPGRADING.md
+%doc %{gem_instdir}/CONTRIBUTE.md
+%doc %{gem_instdir}/CONTRIBUTING.md
 %{gem_instdir}/Rakefile
 %{gem_instdir}/spec
 %{gem_instdir}/%{gem_name}.gemspec
 %doc %{gem_docdir}
 
 %changelog
+* Mon Mar 04 2013 Josef Stribny <jstribny at redhat.com> - 1.3.1-1
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+- Update to Bundler 1.3.1
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index fc3c73d..57a86e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-76a43745352365221b2b7ad06e7a409a  bundler-1.2.1.gem
+723c6fcc13c9e639994536cdcaa451a6  bundler-1.3.1.gem