[rubygem-bundler] Update to Bundler 1.1.4.

Fri Jul 13 10:12:16 UTC 2012

commit f944f970c175ef1c0a94e908ac0a662876b3ddb7
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Fri Jul 13 12:11:45 2012 +0200

    Update to Bundler 1.1.4.

 .gitignore                                         |    1 +
 ...ler-prevent-test-failures-with-ruby-1.9.3.patch |  101 --------------------
 rubygem-bundler.spec                               |   82 ++++++++--------
 sources                                            |    2 +-
 4 files changed, 42 insertions(+), 144 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 3a8e7a5..b81882e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /bundler-1.0.10.gem
 /bundler-1.0.15.gem
 /bundler-1.0.21.gem
+/bundler-1.1.4.gem
diff --git a/rubygem-bundler.spec b/rubygem-bundler.spec
index 3f56396..bd0a103 100644
--- a/rubygem-bundler.spec
+++ b/rubygem-bundler.spec
@@ -1,33 +1,32 @@
 %global gem_name bundler
+%global rubyabi 1.9.1
 
-
-%global thorversion 0.14.6
-%global rdocversion 3.9.4
+%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.0.21
+Version: 1.1.4
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://gembundler.com
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-Patch0: bundler-prevent-test-failures-with-ruby-1.9.3.patch
 Patch1: bundler-add-support-for-binary-extensions-in-dedicated-folde.patch
+Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
-Requires: ruby(abi) = 1.9.1
-Requires: rubygem(thor) = %{thorversion}
+Requires: rubygem(thor)
+Requires: rubygem(net-http-persistent)
+BuildRequires: ruby(abi) = %{rubyabi}
 BuildRequires: rubygems-devel
+BuildRequires: ruby
 %if 0%{enable_test} > 0
 BuildRequires: ruby-devel
-BuildRequires: rubygem(rake)
-BuildRequires: rubygem(thor) = %{thorversion}
-BuildRequires: rubygem(fakeweb) = 1.3.0
-BuildRequires: rubygem(builder) = 2.1.2
-# Use rspec-core until rspec are not migrated to RSpec 2.x
-BuildRequires: rubygem(rspec-core)
+BuildRequires: rubygem(thor)
+BuildRequires: rubygem(net-http-persistent)
+BuildRequires: rubygem(rspec)
 BuildRequires: git sudo
 %endif
 BuildArch: noarch
@@ -50,10 +49,10 @@ Documentation for %{name}
 %setup -q -c -T
 mkdir -p .%{gem_dir}
 gem install --local --install-dir .%{gem_dir} \
-            --force --rdoc %{SOURCE0}
+            --bindir .%{_bindir} \
+            --force %{SOURCE0}
 
 pushd .%{gem_instdir}
-%patch0 -p1
 %patch1 -p1
 popd
 
@@ -65,12 +64,12 @@ cp -a .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
 mkdir -p %{buildroot}/%{_bindir}
-mv %{buildroot}%{gem_dir}/bin/* %{buildroot}/%{_bindir}
-rmdir %{buildroot}%{gem_dir}/bin
+cp -a .%{_bindir}/* \
+        %{buildroot}%{_bindir}/
+
 find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
-rm %{buildroot}/%{gem_instdir}/.gitignore
 
-# Remove bundled Thor
+# Remove bundled libraries
 rm -rf %{buildroot}/%{gem_libdir}/bundler/vendor
 
 # Man pages are used by Bundler internally, do not remove them!
@@ -82,45 +81,41 @@ do
         cp -a %{buildroot}%{gem_libdir}/bundler/man/$i %{buildroot}%{_mandir}/man1/`echo $i.1`
 done
 
-# Remove the man pages sources
-rm -r %{buildroot}%{gem_instdir}/man/
-
-# Specs are still not passing. There are several reasons:
-# 1) Depency on git, git needs modified global configuration settings, this
-#    would mess with developer computer, requires sudo etc.
-# 2) Test needs local copy of rake, fakeweb and builder gems, otherwise they
-#    are installed during runtime.
-# There might be other issues I am not aware of ATM.
-#
-# Nevertheless, specs should be possible to execute after installation.
-#
+# Test suite has to be disabled for official build, since it downloads various
+# gems, which are not in Fedora or they have different version etc.
+# Nevertheless, the test suite passes for local builds.
 %if 0%{enable_test} > 0
 %check
-pushd %{buildroot}%{gem_instdir}
-RUBYOPT="$RUBYOPT -I%{gem_dir}/gems/thor-%{thorversion}/lib -I%{gem_dir}/gems/rdoc-%{rdocversion}/lib" rspec spec/
-# The test suite for 1.0.15 fails with two errors:
-# https://github.com/carlhuda/bundler/issues/1290
-# https://github.com/carlhuda/bundler/issues/986
-# Neither of them should have impact on Bundler functionality.
-rm -rf %{buildroot}%{gem_instdir}/tmp/
+pushd .%{gem_instdir}
+
+# 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/
+
 %endif
 
 %files
 %dir %{gem_instdir}
+%exclude %{gem_instdir}/.*
+%exclude %{gem_instdir}/man
 %{gem_libdir}
 %doc %{gem_instdir}/LICENSE
-%doc %{gem_instdir}/CHANGELOG.md
-%doc %{gem_instdir}/README.md
 %{gem_instdir}/.travis.yml
 %{_bindir}/bundle
 %{gem_instdir}/bin
-%{gem_cache}
+%exclude %{gem_cache}
 %{gem_spec}
 %doc %{_mandir}/man1/*
 %doc %{_mandir}/man5/*
 
 %files doc
+%doc %{gem_instdir}/CHANGELOG.md
 %doc %{gem_instdir}/ISSUES.md
+%doc %{gem_instdir}/README.md
 %doc %{gem_instdir}/UPGRADING.md
 %{gem_instdir}/Rakefile
 %{gem_instdir}/spec
@@ -128,6 +123,9 @@ rm -rf %{buildroot}%{gem_instdir}/tmp/
 %doc %{gem_docdir}
 
 %changelog
+* Fri Jul 13 2012 Vít Ondruch <vondruch at redhat.com> - 1.1.4-1
+- Update to Bundler 1.1.4.
+
 * Wed Feb 01 2012 Vít Ondruch <vondruch at redhat.com> - 1.0.21-1
 - Rebuilt for Ruby 1.9.3.
 - Update to Bundler 1.0.21.
@@ -156,7 +154,7 @@ rm -rf %{buildroot}%{gem_instdir}/tmp/
 
 * Mon Nov 1 2010 Jozef Zigmund <jzigmund at redhat.com> - 1.0.3-2
 - Add ruby(abi) dependency
-- Add using macro %{geminstdir} in files section
+- Add using macro %%{geminstdir} in files section
 - Add subpackage doc for doc files
 - Removed .gitignore file
 - Removed rubygem-thor from vendor folder
diff --git a/sources b/sources
index c615fbf..48eb7ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3878473cbaa1355cbc332f2b8ef44de7  bundler-1.0.21.gem
+82dfe48d7ca8a28696e6a31e68d9015c  bundler-1.1.4.gem
