From 3bc831a403f968f59eaef21e0b1aba530be52f5ade74d81d5e44d4bd2fe355b1 Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Fri, 18 Mar 2011 13:47:34 +0000
Subject: [PATCH] - added ruby-1.8.x_rubylibdir.patch:   allows us to also
 change the path for the stdlib part of the ruby   directory tree

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/ruby?expand=0&rev=20
---
 ruby-1.8.x_rubylibdir.patch | 18 ++++++++++++++++++
 ruby.changes                |  7 +++++++
 ruby.spec                   | 15 +++++----------
 3 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 ruby-1.8.x_rubylibdir.patch

diff --git a/ruby-1.8.x_rubylibdir.patch b/ruby-1.8.x_rubylibdir.patch
new file mode 100644
index 0000000..0d7ad33
--- /dev/null
+++ b/ruby-1.8.x_rubylibdir.patch
@@ -0,0 +1,18 @@
+Index: configure.in
+===================================================================
+--- configure.in.orig
++++ configure.in
+@@ -1757,7 +1757,12 @@ case "$target_os" in
+     rubyw_install_name="$RUBYW_INSTALL_NAME"
+     ;;
+ esac
+-RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
++
++AC_ARG_WITH(rubylibdir,
++	    [  --with-rubylibdir=DIR      stdlib libraries in DIR [[LIBDIR/ruby]]],
++            [rubylibdir=$withval],
++            [rubylibdir='${libdir}/ruby'])
++RUBY_LIB_PREFIX=`eval echo \\"${rubylibdir}\\"`
+ 
+ AC_ARG_WITH(sitedir,
+ 	    [  --with-sitedir=DIR      site libraries in DIR [[LIBDIR/ruby/site_ruby]]],
diff --git a/ruby.changes b/ruby.changes
index 40bc306..d375f5d 100644
--- a/ruby.changes
+++ b/ruby.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar 18 13:46:36 UTC 2011 - mrueckert@suse.de
+
+- added ruby-1.8.x_rubylibdir.patch:
+  allows us to also change the path for the stdlib part of the ruby
+  directory tree
+
 -------------------------------------------------------------------
 Tue Feb 22 16:38:09 UTC 2011 - mrueckert@suse.de
 
diff --git a/ruby.spec b/ruby.spec
index e5f88b8..33a9bf9 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -17,10 +17,9 @@
 
 # norootforbuild
 
-
 Name:           ruby
 Version:        1.8.7.p334
-Release:        1
+Release:        0
 #
 %define pkg_version 1.8.7
 %define patch_level p334
@@ -72,6 +71,7 @@ Patch12:        1887f60a8540f64f5c7bb14d57c0be70506941b8.patch
 Patch13:        ruby-1.8.7.p334_remove_zlib_test_params_test.patch
 # need to discuss with sec team which encoding is better
 Patch14:        ruby-1.8.7.p299_webrick_error_page_encoding.patch
+Patch15:        ruby-1.8.x_rubylibdir.patch
 # vendor ruby files taken from:
 # http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/
 Source3:        site-specific.rb
@@ -84,7 +84,6 @@ Source6:        ruby.macros
 %endif
 #
 Summary:        An Interpreted Object-Oriented Scripting Language
-
 %description
 Ruby is an interpreted scripting language for quick and easy
 object-oriented programming.  It has many features for processing text
@@ -129,7 +128,6 @@ Requires:       %{name} = %{version}
 Requires:       ruby_with_bleak_house = %{bleak_house_version}
 Provides:       ruby-devel_with_bleak_house = %{bleak_house_version}-%{release}
 %endif
-
 %description devel
 Development files to link against Ruby.
 
@@ -144,7 +142,6 @@ License:        GPLv2+
 Group:          Development/Languages/Ruby
 Summary:        TCL/TK bindings for Ruby
 Requires:       %{name} = %{version}
-
 %description tk
 TCL/TK bindings for Ruby
 
@@ -162,7 +159,6 @@ Requires:       %{name} = %{version}
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
 %endif
-
 %description doc-ri
 This package contains the RI docs for ruby
 
@@ -180,7 +176,6 @@ Requires:       %{name} = %{version}
 %if 0%{?suse_version} >= 1120
 BuildArch:      noarch
 %endif
-
 %description doc-html
 This package contains the HTML docs for ruby
 
@@ -195,7 +190,6 @@ License:        GPLv2+
 Group:          Development/Languages/Ruby
 Requires:       %{name} = %{version}
 Summary:        Example scripts for ruby
-
 %description examples
 Example scripts for ruby
 
@@ -210,7 +204,6 @@ License:        GPLv2+
 Group:          Development/Languages/Ruby
 Requires:       %{name} = %{version}
 Summary:        An Interpreted Object-Oriented Scripting Language
-
 %description test-suite
 Ruby is an interpreted scripting language for quick and easy
 object-oriented programming.  It has many features for processing text
@@ -259,6 +252,7 @@ Authors:
 %patch11
 %patch12
 %patch13
+%patch15
 %if 0%{?with_bleak_house}
   for patch in valgrind configure gc ; do
     patch -p0 < bleak_house-%{bleak_house_version}/ruby/${patch}.patch
@@ -268,8 +262,9 @@ find . -type f | xargs -n 1 sed -i "s@#!\s*/usr/local/bin/ruby@#!/usr/bin/ruby@"
 # make sure it _really_ rebuilds parse.c for us
 old parse.c
 
+
 %build
-# autoreconf -fi
+autoreconf -fi
 export CFLAGS="%{optflags} -g -fno-strict-aliasing"
 %configure                                         \
     --target=%{_target_platform}                   \