From 6955a36e59f68c84792f4613ba0d8b3cde2450c1 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@fedoraproject.org>
Date: Sep 26 2005 08:58:25 +0000
Subject: - ruby-multilib.patch: added another chunk for multilib.


---

diff --git a/ruby-multilib.patch b/ruby-multilib.patch
index 5f2f75b..1caf23d 100644
--- a/ruby-multilib.patch
+++ b/ruby-multilib.patch
@@ -10,3 +10,25 @@ diff -ruN ruby-1.8.3.orig/mkconfig.rb ruby-1.8.3/mkconfig.rb
  print "  TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
  print "  DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
  print "  CONFIG = {}\n"
+diff -ruN ruby-1.8.3.orig/configure.in ruby-1.8.3/configure.in
+--- ruby-1.8.3.orig/configure.in	2005-09-07 08:22:56.000000000 +0900
++++ ruby-1.8.3/configure.in	2005-09-26 17:46:53.000000000 +0900
+@@ -1424,15 +1424,15 @@
+     RUBY_LIB_PREFIX="/lib/ruby"
+     ;;
+   *)
+-    RUBY_LIB_PREFIX="${prefix}/lib/ruby"
++    RUBY_LIB_PREFIX="${libdir}/ruby"
+     ;;
+ esac
+ RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
+ 
+ AC_ARG_WITH(sitedir,
+-	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
++	    [  --with-sitedir=DIR      site libraries in DIR [LIBDIR/ruby/site_ruby]],
+             [sitedir=$withval],
+-            [sitedir='${prefix}/lib/ruby/site_ruby'])
++            [sitedir='${libdir}/ruby/site_ruby'])
+ SITE_DIR="`eval \"echo ${sitedir}\"`"
+ case "$target_os" in
+   cygwin*|mingw*|*djgpp*|os2-emx*)
diff --git a/ruby.spec b/ruby.spec
index 04b87f8..0c53517 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -4,7 +4,7 @@
 
 Name:		ruby
 Version:	1.8.3
-Release: 1
+Release: 2
 License:	Distributable
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -414,6 +414,9 @@ rm -rf tmp-ruby-docs
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
+* Mon Sep 26 2005 Akira TAGOH <tagoh@redhat.com> - 1.8.3-2
+- ruby-multilib.patch: added another chunk for multilib.
+
 * Wed Sep 21 2005 Akira TAGOH <tagoh@redhat.com> - 1.8.3-1
 - New upstream release.
 - Build-Requires xorg-x11-devel instead of XFree86-devel.