- fix -vendordir.patch, fix load-path

- rel. 4

Changed files:
    ruby-vendordir.patch -> 1.5
    ruby.spec -> 1.173

diff --git a/ruby-vendordir.patch b/ruby-vendordir.patch
index 646c99c89de5e4c9d09d39934e958f2de7a6a6cf..540b09dd0b2386554adf0445ba9174a17d91edd7 100644 (file)
--- a/ruby-vendordir.patch
+++ b/ruby-vendordir.patch
@@ -9,7 +9,7 @@ diff -ur ruby-1.8.6-p111-o/configure.in ruby-1.8.6-p111/configure.in
 +          [  --with-vendordir=DIR      vendor libraries in DIR [LIBDIR/ruby/vendor_ruby]],
 +            [vendordir=$withval],
 +            [vendordir='${libdir}/ruby/vendor_ruby'])
-+VENDOR_DIR="`eval \"echo ${vendordir}\"`"
++VENDOR_DIR=`eval echo \\"${vendordir}\\"`
 +case "$target_os" in
 +  cygwin*|mingw*|*djgpp*|os2_emx*)
 +    RUBY_VENDOR_LIB_PATH="`expr "$VENDOR_DIR" : "$prefix\(/.*\)"`" ||
@@ -57,18 +57,6 @@ diff -ur ruby-1.8.6-p111-o/configure.in ruby-1.8.6-p111/configure.in
  
  AC_ARG_WITH(search-path,
                [  --with-search-path=DIR specify the additional search path],
-diff -ur ruby-1.8.6-p111-o/configure.in.orig ruby-1.8.6-p111/configure.in.orig
---- ruby-1.8.6-p111-o/configure.in.orig        2007-12-07 19:02:05.000000000 -0700
-+++ ruby-1.8.6-p111/configure.in.orig  2007-12-07 21:42:59.000000000 -0700
-@@ -1552,7 +1552,7 @@
-     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}"
 diff -ur ruby-1.8.6-p111-o/instruby.rb ruby-1.8.6-p111/instruby.rb
 --- ruby-1.8.6-p111-o/instruby.rb      2007-12-07 18:57:32.000000000 -0700
 +++ ruby-1.8.6-p111/instruby.rb        2007-12-07 21:44:21.000000000 -0700

diff --git a/ruby.spec b/ruby.spec
index 43644a8b9aab84e58fcd350810a089d9e55f0677..a741d47f31e06669a56231f5ab9aba33e22866a4 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -19,7 +19,7 @@ Summary(pt_BR.UTF-8): Linguagem de script orientada a objeto
 Summary(zh_CN.UTF-8):  ruby - 一种快速高效的面向对象脚本编程语言
 Name:          ruby
 Version:       1.8.6
-Release:       3
+Release:       4
 Epoch:         1
 License:       The Ruby License
 Group:         Development/Languages