[packages/ruby/dev-2.1] add archlibdir.patch to configure archlibdir, update files

[glen]

commit a319cc02e44937d38cc069ebb2a2a8f92dded61d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Jul 30 23:40:09 2015 +0300

    add archlibdir.patch to configure archlibdir, update files

 archlibdir.patch | 28 ++++++++++++++++++++++++++++
 ruby.spec        |  9 +++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index 08ed23c..a71ca7c 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -73,6 +73,7 @@ Patch8:		rubygems-2.0.0-binary-extensions.patch
 Patch9:		custom-rubygems-location.patch
 Patch10:	%{oname}-posixsh.patch
 Patch11:	x32-asm.patch
+Patch12:	archlibdir.patch
 URL:		http://www.ruby-lang.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -436,6 +437,7 @@ Biblioteka JSON dla języka Ruby.
 %patch9 -p1
 #%patch10 -p1
 #%patch11 -p1
+%patch12 -p1
 
 # must be regenerated with new bison
 %{__rm} parse.{c,h}
@@ -479,6 +481,7 @@ cd ..
 %configure \
 	%{?with_bootstrap:--with-baseruby=%{oname}-1.8.7-p330/miniruby} \
 	--program-suffix=%{ruby_suffix} \
+	--with-archlibdir=%{_libdir} \
 	--with-rubygemsdir=%{rubygems_dir} \
 	--with-rubylibprefix=%{ruby_libdir} \
 	--with-rubyarchprefix=%{ruby_archdir} \
@@ -852,7 +855,6 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/socket.rb
 %{ruby_libdir}/sync.rb
 %{ruby_libdir}/tempfile.rb
-%{ruby_libdir}/thread.rb
 %{ruby_libdir}/thwait.rb
 %{ruby_libdir}/time.rb
 %{ruby_libdir}/timeout.rb
@@ -880,7 +882,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{ruby_archdir}/bigdecimal.so
 %attr(755,root,root) %{ruby_archdir}/continuation.so
 %attr(755,root,root) %{ruby_archdir}/coverage.so
-%attr(755,root,root) %{ruby_archdir}/curses.so
+#%attr(755,root,root) %{ruby_archdir}/curses.so
 %attr(755,root,root) %{ruby_archdir}/date_core.so
 %attr(755,root,root) %{ruby_archdir}/dbm.so
 %attr(755,root,root) %{ruby_archdir}/digest.so
@@ -898,6 +900,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{ruby_archdir}/pty.so
 %attr(755,root,root) %{ruby_archdir}/readline.so
 %attr(755,root,root) %{ruby_archdir}/ripper.so
+%attr(755,root,root) %{ruby_archdir}/thread.so
 %attr(755,root,root) %{ruby_archdir}/sdbm.so
 %attr(755,root,root) %{ruby_archdir}/socket.so
 %attr(755,root,root) %{ruby_archdir}/stringio.so
@@ -919,6 +922,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{ruby_archdir}/mathn/*.so
 %dir %{ruby_archdir}/racc
 %attr(755,root,root) %{ruby_archdir}/racc/*.so
+%dir %{ruby_archdir}/rbconfig
+%attr(755,root,root) %{ruby_archdir}/rbconfig/sizeof.so
 
 # bigdecimal
 %{gem_dir}/specifications/bigdecimal-%{bigdecimal_ver}.gemspec
diff --git a/archlibdir.patch b/archlibdir.patch
new file mode 100644
index 0000000..4a4919c
--- /dev/null
+++ b/archlibdir.patch
@@ -0,0 +1,28 @@
+From 07c666ba5c3360dd6f43605a8ac7c85c99c1721f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch at redhat.com>
+Date: Tue, 1 Oct 2013 12:22:40 +0200
+Subject: [PATCH] Allow to configure libruby.so placement.
+
+---
+ configure.in | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/configure.in b/configure.in
+index 37d9a62..553d4d0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -3143,6 +3143,11 @@ if test ${multiarch+set}; then
+ fi
+ 
+ archlibdir='${libdir}/${arch}'
++AC_ARG_WITH(archlibdir,
++	    AS_HELP_STRING([--with-archlibdir=DIR],
++			   [prefix for libruby [[LIBDIR/ARCH]]]),
++	    [archlibdir="$withval"])
++
+ sitearchlibdir='${libdir}/${sitearch}'
+ archincludedir='${includedir}/${arch}'
+ sitearchincludedir='${includedir}/${sitearch}'
+-- 
+1.8.3.1
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/e8995a8bbd9a57598140860e25b2aed9582f03d1