[ruby/f17] Revert accidental merge of 1.9.3.125 from F-18 -> F-17

[Peter Robinson]

commit a942830f25e328b4a3be45c1ee253b92c9f524e6
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Feb 29 15:44:00 2012 +0000

    Revert accidental merge of 1.9.3.125 from F-18 -> F-17
    
    Revert "Temporarily disable make check on ARM until it's fixed upstream. Tracked in RHBZ 789410"
    
    This reverts commit 91599c23af5fa4c484ef0f76f48042a7d3ad3b82.

 ruby.spec |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index 47130c7..dd74ad9 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -51,7 +51,7 @@
 Summary: An interpreter of object-oriented scripting language
 Name: ruby
 Version: %{ruby_version_patch_level}
-Release: 2%{?dist}
+Release: 1%{?dist}
 Group: Development/Languages
 License: Ruby or BSD
 URL: http://ruby-lang.org/
@@ -146,7 +146,7 @@ libraries.
 
 
 %package -n rubygems-devel
-Summary:    Macros and development tools for packaging RubyGems
+Summary:    Macros and development tools for packagin RubyGems
 Version:    %{rubygems_version}
 Group:      Development/Libraries
 License:    Ruby or MIT
@@ -154,7 +154,7 @@ Requires:   ruby(rubygems) = %{version}-%{release}
 BuildArch:  noarch
 
 %description -n rubygems-devel
-Macros and development tools for packaging RubyGems.
+Macros and development tools for packagin RubyGems.
 
 
 %package -n rubygem-rake
@@ -243,7 +243,7 @@ Requires:   ruby(rubygems) >= %{rubygems_version}
 Provides:   rubygem(io-console) = %{version}-%{release}
 
 %description -n rubygem-io-console
-IO/Console provides very simple and portable access to console. It doesn't
+IO/Console provides very simple and portable access to console. It doesn’t
 provide higher layer features, such like curses and readline.
 
 
@@ -426,14 +426,9 @@ sed -i '2 a\
   s.require_paths = ["lib"]' %{buildroot}/%{gem_dir}/specifications/minitest-%{minitest_version}.gemspec
 
 %check
-# Disable make check on ARM until the bug is fixed
-# https://bugzilla.redhat.com/show_bug.cgi?id=789410
-# https://bugs.ruby-lang.org/issues/6011
-%ifnarch %{arm}
 # TODO: Investigate the test failures.
 # https://bugs.ruby-lang.org/issues/6036
 make check TESTS="-v -x test_pathname.rb -x test_drbssl.rb -x test_parse.rb -x test_x509cert.rb"
-%endif
 
 %post libs -p /sbin/ldconfig
 
@@ -469,7 +464,11 @@ make check TESTS="-v -x test_pathname.rb -x test_drbssl.rb -x test_parse.rb -x t
 
 %config(noreplace) %{_sysconfdir}/rpm/macros.ruby
 
-%{_includedir}/*
+%{_includedir}/ruby.h
+%{_includedir}/ruby
+%dir %{_includedir}/%{_normalized_cpu}-%{_target_os}
+%{_includedir}/%{_normalized_cpu}-%{_target_os}/ruby
+
 %{_libdir}/libruby.so
 %{_libdir}/pkgconfig/ruby-%{major_minor_version}.pc
 
@@ -699,9 +698,6 @@ make check TESTS="-v -x test_pathname.rb -x test_drbssl.rb -x test_parse.rb -x t
 %{ruby_libdir}/tkextlib
 
 %changelog
-* Wed Feb 29 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.9.3.125-2
-- Temporarily disable make check on ARM until it's fixed upstream. Tracked in RHBZ 789410
-
 * Mon Feb 20 2012 Vít Ondruch <vondruch at redhat.com> - 1.9.3.125-1
 - Upgrade to Ruby 1.9.3-p125.