Rebuilt for Ruby 1.9.3.

1 files changed, 40 insertions, 37 deletions

diff --git a/rubygem-oauth.spec b/rubygem-oauth.spec
index 7ecf520..f701b51 100644
--- a/rubygem-oauth.spec
+++ b/rubygem-oauth.spec
@@ -1,37 +1,35 @@
 # Generated from oauth-0.4.4.gem by gem2rpm -*- rpm-spec -*-
-%global gemname oauth
+%global gem_name oauth
 
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
-%global rubyabi 1.8
+%global rubyabi 1.9.1
 
 # Can be enabled if build system has connectivity into internet.
 # Unfortunatelly this is not the case of Koji atm.
 %global has_network_connectivity 0
 
 Summary: OAuth Core Ruby implementation
-Name: rubygem-%{gemname}
+Name: rubygem-%{gem_name}
 Version: 0.4.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 License: MIT
 URL: https://github.com/oauth/oauth-ruby
-Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
 Requires: ruby
 BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: ruby(rubygems)
+BuildRequires: rubygems-devel
 BuildRequires: ruby
 BuildRequires: rubygem(mocha)
 BuildRequires: rubygem(typhoeus)
 BuildRequires: rubygem(curb)
 BuildRequires: rubygem(actionpack)
-BuildRequires: rubygem(actionpack)
+BuildRequires: rubygem(minitest)
 # Enable when available in Fedora.
 # BuildRequires: rubygem(em-http-request)
 BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Provides: rubygem(%{gem_name}) = %{version}
 
 %description
 This is a RubyGem for implementing both OAuth clients and servers
@@ -51,29 +49,29 @@ Documentation for %{name}
 
 %prep
 %setup -q -c -T
-mkdir -p .%{gemdir}
-gem install --local --install-dir .%{gemdir} \
+mkdir -p .%{gem_dir}
+gem install --local --install-dir .%{gem_dir} \
             --bindir .%{_bindir} \
             --force %{SOURCE0}
 
 %build
 
 %install
-mkdir -p %{buildroot}%{gemdir}
-cp -a .%{gemdir}/* \
-        %{buildroot}%{gemdir}/
+mkdir -p %{buildroot}%{gem_dir}
+cp -a .%{gem_dir}/* \
+        %{buildroot}%{gem_dir}/
 
 mkdir -p %{buildroot}%{_bindir}
 cp -a .%{_bindir}/* \
         %{buildroot}%{_bindir}/
 
-find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
+find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
 
-rm %{buildroot}%{geminstdir}/.gitignore
-chmod a-x %{buildroot}%{geminstdir}/examples/yql.rb
+rm %{buildroot}%{gem_instdir}/.gitignore
+chmod a-x %{buildroot}%{gem_instdir}/examples/yql.rb
 
 %check
-pushd .%{geminstdir}
+pushd .%{gem_instdir}
 # The following test fails due to Rails 3 incompatibility. Oauth my fail also,
 # but it seems that Rails 3 users don't care.
 # https://github.com/oauth/oauth-ruby/issues/13
@@ -83,33 +81,38 @@ mv test/test_action_controller_request_proxy.rb test/test_action_controller_requ
 %if 0%{?has_network_connectivity} < 1
 sed -i '207,+24d' test/test_net_http_client.rb
 %endif
-
-RUBYOPT="Ilib" ruby -e "Dir.glob('test/**/test_*.rb').each {|t| require t}"
+# one test fails because of lowercase/uppercase d/D
+# reported: https://github.com/oauth/oauth-ruby/issues/45
+ruby -Ilib -e "Dir.glob('./test/**/test_*.rb').each {|t| require t}" | \
+	grep "115 tests, 299 assertions, 1 failures, 0 errors, 0 skips"
 popd
 
 %files
-%dir %{geminstdir}
-%doc %{geminstdir}/LICENSE
+%dir %{gem_instdir}
+%doc %{gem_instdir}/LICENSE
 %{_bindir}/oauth
-%{geminstdir}/bin
-%{geminstdir}/lib
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%{gem_instdir}/bin
+%{gem_libdir}
+%{gem_cache}
+%{gem_spec}
 
 %files doc
-%doc %{gemdir}/doc/%{gemname}-%{version}
-%doc %{geminstdir}/HISTORY
-%doc %{geminstdir}/README.rdoc
-%doc %{geminstdir}/TODO
-%{geminstdir}/Gemfile*
-%{geminstdir}/oauth.gemspec
-%{geminstdir}/Rakefile
-%doc %{geminstdir}/examples
-%{geminstdir}/tasks
-%{geminstdir}/test
+%doc %{gem_docdir}
+%doc %{gem_instdir}/HISTORY
+%doc %{gem_instdir}/README.rdoc
+%doc %{gem_instdir}/TODO
+%{gem_instdir}/Gemfile*
+%{gem_instdir}/oauth.gemspec
+%{gem_instdir}/Rakefile
+%doc %{gem_instdir}/examples
+%{gem_instdir}/tasks
+%{gem_instdir}/test
 
 
 %changelog
+* Mon Feb 06 2012 Vít Ondruch <vondruch@redhat.com> - 0.4.4-3
+- Rebuilt for Ruby 1.9.3.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild