[rubygem-journey] Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0

[Vít Ondruch]

commit cc5452a223725f3c3ce01c8936896a5f45735789
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Mon Mar 4 12:38:36 2013 +0100

    Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0

 rubygem-journey-2.0.0-fix-assertion-calls.patch |   66 +++++++++++++++++++++++
 rubygem-journey.spec                            |   21 +++++---
 2 files changed, 80 insertions(+), 7 deletions(-)
---
diff --git a/rubygem-journey-2.0.0-fix-assertion-calls.patch b/rubygem-journey-2.0.0-fix-assertion-calls.patch
new file mode 100644
index 0000000..ae2992b
--- /dev/null
+++ b/rubygem-journey-2.0.0-fix-assertion-calls.patch
@@ -0,0 +1,66 @@
+From d836e960d9a20c4c5bc986630d2ba34a340959ea Mon Sep 17 00:00:00 2001
+From: Aaron Patterson <aaron.patterson at gmail.com>
+Date: Fri, 27 Jul 2012 11:20:58 -0700
+Subject: [PATCH] fix assertion calls
+
+---
+ test/path/test_pattern.rb |   22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/test/path/test_pattern.rb b/test/path/test_pattern.rb
+index c684a0a..ec93471 100644
+--- a/test/path/test_pattern.rb
++++ b/test/path/test_pattern.rb
+@@ -85,9 +85,9 @@ def test_to_regexp_with_extended_group
+           ["/", ".", "?"]
+         )
+         path = Pattern.new strexp
+-        assert_match('/page/tender', path)
+-        assert_match('/page/love', path)
+-        refute_match('/page/loving', path)
++        assert_match(path, '/page/tender')
++        assert_match(path, '/page/love')
++        refute_match(path, '/page/loving')
+       end
+ 
+       def test_optional_names
+@@ -108,8 +108,8 @@ def test_to_regexp_match_non_optional
+           ["/", ".", "?"]
+         )
+         path = Pattern.new strexp
+-        assert_match('/123', path)
+-        refute_match('/', path)
++        assert_match(path, '/123')
++        refute_match(path, '/')
+       end
+ 
+       def test_to_regexp_with_group
+@@ -119,9 +119,9 @@ def test_to_regexp_with_group
+           ["/", ".", "?"]
+         )
+         path = Pattern.new strexp
+-        assert_match('/page/tender', path)
+-        assert_match('/page/love', path)
+-        refute_match('/page/loving', path)
++        assert_match(path, '/page/tender')
++        assert_match(path, '/page/love')
++        refute_match(path, '/page/loving')
+       end
+ 
+       def test_ast_sets_regular_expressions
+@@ -186,9 +186,9 @@ def test_insensitive_regexp_with_group
+           ["/", ".", "?"]
+         )
+         path = Pattern.new strexp
+-        assert_match('/page/TENDER/aaron', path)
+-        assert_match('/page/loVE/aaron', path)
+-        refute_match('/page/loVE/AAron', path)
++        assert_match(path, '/page/TENDER/aaron')
++        assert_match(path, '/page/loVE/aaron')
++        refute_match(path, '/page/loVE/AAron')
+       end
+ 
+       def test_to_regexp_with_strexp
+-- 
+1.7.10
+
diff --git a/rubygem-journey.spec b/rubygem-journey.spec
index 8b0978c..3bafa13 100644
--- a/rubygem-journey.spec
+++ b/rubygem-journey.spec
@@ -6,20 +6,22 @@
 # https://github.com/rails/journey/issues/15
 
 %global gem_name journey
-%global rubyabi 1.9.1
 
 Summary: Journey is a router
 Name: rubygem-%{gem_name}
 Version: 1.0.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 # Public Domain - %%{gem_libdir}/journey/visualizer/reset.css
 License: MIT and Public Domain
 URL: http://github.com/rails/journey
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-Requires: ruby(abi) = %{rubyabi}
+# Fixes "TypeError: no implicit conversion of Journey::Path::Pattern into String"
+# https://github.com/rails/journey/commit/d836e960d9a20c4c5bc986630d2ba34a340959ea
+Patch0: rubygem-journey-2.0.0-fix-assertion-calls.patch
+Requires: ruby(release)
 Requires: ruby(rubygems)
-BuildRequires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby
 BuildRequires: rubygem(minitest)
@@ -42,9 +44,11 @@ Documentation for %{name}
 
 %prep
 %setup -q -c -T
-mkdir -p .%{gem_dir}
-gem install --local --install-dir .%{gem_dir} \
-            --force %{SOURCE0}
+%gem_install -n %{SOURCE0}
+
+pushd .%{gem_instdir}
+%patch0 -p1
+popd
 
 %build
 
@@ -76,6 +80,9 @@ popd
 %{gem_instdir}/test
 
 %changelog
+* Mon Mar 04 2013 Vít Ondruch <vondruch at redhat.com> - 1.0.4-3
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild