[rubygem-bundler] Updated to Bundler 1.0.15

Vít Ondruch vondruch at fedoraproject.org
Thu Jul 7 14:38:56 UTC 2011


commit a6b46419681124d9ad4c70b4ba4991c0a8612cdc
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Thu Jul 7 16:38:26 2011 +0200

    Updated to Bundler 1.0.15

 .gitignore                          |    1 +
 bundler-rspec13-compatibility.patch |  248 -----------------------------------
 rubygem-bundler.spec                |   51 ++++----
 sources                             |    2 +-
 4 files changed, 30 insertions(+), 272 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 81e347e..9769d68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /bundler-1.0.9.gem
 /bundler-1.0.10.gem
+/bundler-1.0.15.gem
diff --git a/rubygem-bundler.spec b/rubygem-bundler.spec
index 4bdbd15..b1253f9 100644
--- a/rubygem-bundler.spec
+++ b/rubygem-bundler.spec
@@ -1,30 +1,33 @@
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global gemname bundler
+
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
 %global thorversion 0.14.6
 
+%{!?enable_test: %global enable_test 0}
+
 Summary: Library and utilities to manage a Ruby application's gem dependencies
 Name: rubygem-%{gemname}
-Version: 1.0.10
-Release: 2%{?dist}
+Version: 1.0.15
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://gembundler.com
 Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
-# Bundler is using RSpec 2 but we are not that far yet.
-Patch0: bundler-rspec13-compatibility.patch
 Requires: rubygems
 Requires: ruby(abi) = 1.8
 Requires: rubygem(thor) = %{thorversion}
 BuildRequires: rubygems
-# Not necessary as long as specs are not executed.
-# BuildRequires: rubygem(rake)
-# BuildRequires: rubygem(thor) = %{thorversion}
-# BuildRequires: rubygem(fakeweb) = 1.3.0
-# BuildRequires: rubygem(builder) = 2.1.2
-# BuildRequires: rubygem(rspec)
-# BuildRequires: git
+%if 0%{enable_test} > 0
+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: git sudo
+%endif
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -47,9 +50,6 @@ mkdir -p .%{gemdir}
 gem install --local --install-dir .%{gemdir} \
             --force --rdoc %{SOURCE0}
 
-pushd .%{geminstdir}
-%patch0 -p0
-
 %build
 
 %install
@@ -87,16 +87,18 @@ rm -r %{buildroot}%{geminstdir}/man/
 #
 # Nevertheless, specs should be possible to execute after installation.
 #
-# %check
-# pushd %{buildroot}%{geminstdir}
-# RUBYOPT="$RUBYOPT I%{gemdir}/gems/thor-%{thorversion}/lib" spec spec/
-# rm -rf %{buildroot}%{geminstdir}/tmp/
-
-%clean
-rm -rf %{buildroot}
+%if 0%{enable_test} > 0
+%check
+pushd %{buildroot}%{geminstdir}
+RUBYOPT="$RUBYOPT I%{gemdir}/gems/thor-%{thorversion}/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}%{geminstdir}/tmp/
+%endif
 
 %files
-%defattr(-, root, root, -)
 %dir %{geminstdir}
 %{geminstdir}/lib
 %doc %{geminstdir}/LICENSE
@@ -119,6 +121,9 @@ rm -rf %{buildroot}
 %doc %{gemdir}/doc/%{gemname}-%{version}
 
 %changelog
+* Thu Jul 07 2011 Vít Ondruch <vondruch at redhat.com> - 1.0.15-1
+- Updated to Bundler 1.0.15
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 2b313c8..84f874c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d848cafc6ef572bff6d80b1c98c2f443  bundler-1.0.10.gem
+e4effdeeffa0ee3535f5b4bd13ed0dd1  bundler-1.0.15.gem


More information about the scm-commits mailing list