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

Vít Ondruch vondruch at fedoraproject.org
Thu Mar 21 09:34:38 UTC 2013


commit 0f03883da876b56984dfb15fdee57140795857a9
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Thu Mar 21 10:34:28 2013 +0100

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

 rubygem-regin.spec |   36 +++++++++++++++++++-----------------
 sources            |    2 +-
 2 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/rubygem-regin.spec b/rubygem-regin.spec
index 7da3939..86a1dd2 100644
--- a/rubygem-regin.spec
+++ b/rubygem-regin.spec
@@ -1,10 +1,9 @@
 %global gem_name regin
-%global rubyabi 1.9.1
 
 Summary: Ruby Regexp Introspection
 Name: rubygem-%{gem_name}
 Version: 0.3.8
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/josh/%{gem_name}
@@ -13,13 +12,11 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 # tar czvf regin-tests.tgz spec/
 # TODO: Tests should be versioned.
 Source1: %{gem_name}-tests.tgz
-Requires: ruby(abi) = %{rubyabi}
+Requires: ruby(release)
 Requires: ruby(rubygems)
-Requires: ruby
 BuildRequires: rubygems-devel
 BuildRequires: ruby
-# Use rspec-core until rspec are not migrated to RSpec 2.x
-BuildRequires: rubygem(rspec-core)
+BuildRequires: rubygem(rspec)
 BuildArch: noarch
 Provides: rubygem(%{gem_name}) = %{version}
 
@@ -37,41 +34,46 @@ Requires:%{name} = %{version}-%{release}
 Documentation for %{name}
 
 %prep
+%setup -q -c -T
+%gem_install -n %{SOURCE0}
 
 %build
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
-gem install --local --install-dir %{buildroot}%{gem_dir} \
-            --force --rdoc %{SOURCE0}
-
-%clean
+cp -pa .%{gem_dir}/* \
+        %{buildroot}%{gem_dir}/
 
 %check
-mkdir %{_tmppath}/%{gem_name}-%{version}
-tar xzvf %{SOURCE1} -C %{_tmppath}/%{gem_name}-%{version}
+pushd .%{gem_instdir}
+tar xzvf %{SOURCE1}
+
+# Test fails due to a Ruby bug
+# http://bugs.ruby-lang.org/issues/8133
+# http://bugs.ruby-lang.org/issues/8135
+sed -i "23d" spec/parser_spec.rb
 
-pushd %{_tmppath}/%{gem_name}-%{version}
-RUBYOPT="-I%{buildroot}%{gem_libdir}" rspec spec/
+rspec -Ilib spec/
 popd
 
 rm -rf %{_tmppath}/%{gem_name}-%{version}
 
 %files
-%defattr(-, root, root, -)
 %dir %{gem_instdir}
 %{gem_libdir}
 %doc %{gem_instdir}/LICENSE
 %doc %{gem_instdir}/README.rdoc
-%{gem_cache}
+%exclude %{gem_cache}
 %{gem_spec}
 
 %files doc
-%defattr(-, root, root, -)
 %doc %{gem_docdir}
 
 
 %changelog
+* Wed Mar 20 2013 Josef Stribny <jstribny at redhat.com> - 0.3.8-6
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index bedc0bd..8c06c82 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8fa86f2bc2dcf0e2771b263c6300cbf9  regin-tests.tgz
 ecedb2b16c073cb146394a5a84fd26b5  regin-0.3.8.gem
+8fa86f2bc2dcf0e2771b263c6300cbf9  regin-tests.tgz


More information about the scm-commits mailing list