diff -ruN rpmbuild.orig/SPECS/ruby.spec rpmbuild/SPECS/ruby.spec
--- rpmbuild.orig/SPECS/ruby.spec	2014-08-13 15:28:01.000000000 +0200
+++ rpmbuild/SPECS/ruby.spec	2014-11-16 01:09:40.411014423 +0100
@@ -12,13 +12,14 @@
 %{!?ruby_sitearch:	%global ruby_sitearch	%{ruby_vendorarch}/site_ruby}
 
 %global	_normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/')
+%global	abi %(echo %{_gnu} | sed 's/^-gnu$//;s/^-gnueabi$/-eabi/')
 %global	tk_using_svn_number 27738
 
 %global with_systemtap 1
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	2%{?dist}
+Release:	2%{?dist}.1
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -271,7 +272,9 @@
 %configure \
   --with-default-kcode=none \
   --enable-shared \
+%ifnarch %{arm}
   --enable-pthread \
+%endif
   --disable-rpath \
 %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6
   --with-readline-include=%{_includedir}/readline5 \
@@ -428,7 +431,7 @@
 rm -rf %{name}-%{arcver}/.ext/rdoc
 env \
   LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} \
-  RUBYLIB=$RPM_BUILD_ROOT%{ruby_vendorarch}/%{rubyxver}:$RPM_BUILD_ROOT%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os} \
+  RUBYLIB=$RPM_BUILD_ROOT%{ruby_vendorarch}/%{rubyxver}:$RPM_BUILD_ROOT%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}%{abi} \
  make -C $rubybuilddir \
    DESTDIR=$RPM_BUILD_ROOT \
    install-doc
@@ -439,7 +442,7 @@
   LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} \
   $RPM_BUILD_ROOT%{_bindir}/ruby \
     -I $rubybuilddir \
-    -I $RPM_BUILD_ROOT%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/ \
+    -I $RPM_BUILD_ROOT%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}%{abi}/ \
     -I $rubybuilddir/lib \
     $RPM_BUILD_ROOT%{_bindir}/rdoc \
     --all --ri-system \
@@ -447,7 +450,7 @@
 %endif
 
 mkdir -p $RPM_BUILD_ROOT%{ruby_sitelib}/%{rubyxver}
-mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}
+mkdir -p $RPM_BUILD_ROOT%{ruby_sitearch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}%{abi}
 
 # XXX: installing irb
 install -p -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -521,7 +524,7 @@
 %doc %{name}-%{arcver}/README.EXT
 %lang(ja) %doc %{name}-%{arcver}/README.EXT.ja
 %{_libdir}/libruby.so
-%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/*.h
+%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}%{abi}/*.h
 
 %files static
 %defattr(-, root, root, -)
@@ -550,8 +553,8 @@
 %exclude %{ruby_vendorlib}/%{rubyxver}/tk
 %exclude %{ruby_vendorlib}/%{rubyxver}/tk*.rb
 %exclude %{ruby_vendorlib}/%{rubyxver}/tkextlib
-%exclude %{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/tcltklib.so
-%exclude %{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/tkutil.so
+%exclude %{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}%{abi}/tcltklib.so
+%exclude %{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}%{abi}/tkutil.so
 ## the following files should goes into ruby-rdoc package.
 %exclude %{ruby_vendorlib}/%{rubyxver}/rdoc
 ## the following files should goes into ruby-irb package.
@@ -584,11 +587,11 @@
 %{ruby_vendorlib}/%{rubyxver}/xsd
 %{ruby_vendorlib}/%{rubyxver}/yaml
 %{_libdir}/libruby.so.*
-%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/*.so
-%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/digest
-%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/io
-%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/racc
-%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/rbconfig.rb
+%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}%{abi}/*.so
+%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}%{abi}/digest
+%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}%{abi}/io
+%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}%{abi}/racc
+%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}%{abi}/rbconfig.rb
 
 %files tcltk
 %defattr(-, root, root, -)
@@ -603,8 +606,8 @@
 %{ruby_vendorlib}/%{rubyxver}/tk
 %{ruby_vendorlib}/%{rubyxver}/tk*.rb
 %{ruby_vendorlib}/%{rubyxver}/tkextlib
-%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/tcltklib.so
-%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}/tkutil.so
+%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}%{abi}/tcltklib.so
+%{ruby_vendorarch}/%{rubyxver}/%{_normalized_cpu}-%{_target_os}%{abi}/tkutil.so
 
 %files rdoc
 %defattr(-, root, root, -)
@@ -650,6 +653,10 @@
 %doc tmp-ruby-docs/ruby-libs/*
 
 %changelog
+* Fri Nov 14 2014 Jacco Ligthart <jacco@redsleeve.org> - 1.8.7.374-2.0
+- Disable pthread on ARM because tcl/tk defaults to no threading on ARM
+- Fix linux vs linux-eabi disagreement for library paths
+
 * Tue Aug 12 2014 Vít Ondruch <vondruch@redhat.com> - 1.8.7.374-2
 - Replace hardcoded MD5 by sha256 to prevent SSL server failure in FIPS mode.
   * ruby-1.8.7-p374-Replace-md5-by-sha256-to-fix-SSL-server-FIPS-compatibility.patch