conflict with rpm-build-macros with bad ruby_version macro

[packages/ruby.git] / ruby-lib64.patch

diff --git a/ruby-lib64.patch b/ruby-lib64.patch
index 7b30310ab506055eab79616a14028201753c8b78..c0c3d48deffad8fa130fc646944f2917b4ad2aa9 100644 (file)
--- a/ruby-lib64.patch
+++ b/ruby-lib64.patch
@@ -1,23 +1,11 @@
---- ruby-1.8.6-preview1-o/configure.in 2007-02-20 01:02:11.000000000 -0700
-+++ ruby-1.8.6-preview1-n/configure.in 2007-02-20 01:20:48.000000000 -0700
-@@ -1241,7 +1241,7 @@
-     if test "$rb_cv_missing_fconvert" = yes; then
-       AC_DEFINE(MISSING_FCONVERT)
-     fi
--    AC_LIBOBJ([x68.o])
-+    AC_LIBOBJ([x68])
-     CFLAGS="$CFLAGS -fansi-only"
-     XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
-     EXEEXT=.x
-
---- ruby-1.8.7-p72/ext/tk/extconf.rb~  2009-02-26 01:29:16.000000000 +0200
-+++ ruby-1.8.7-p72/ext/tk/extconf.rb   2009-02-26 01:33:54.847015682 +0200
-@@ -182,7 +182,7 @@
+--- ruby-1.9.2-p0-o//ext/tk/extconf.rb 2010-08-08 09:01:15.000000000 -0600
++++ ruby-1.9.2-p0/ext/tk/extconf.rb    2010-09-16 17:17:25.000000000 -0600
+@@ -1188,7 +1188,7 @@
  
  def find_X11(*opt_paths)
-   default_paths = 
--    [ "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib" ]
-+    [ "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib64", "/usr/X11R6/lib", "/usr/openwin/lib" ]
-   paths = opt_paths.compact.concat(default_paths)
-   st = find_library("X11", "XOpenDisplay", *paths)
-   unless st
+   defaults =
+-    [ "/usr/X11*/lib", "/usr/lib/X11*", "/usr/local/X11*", "/usr/openwin/lib" ]
++    [ "/usr/X11*/lib", "/usr/X11*/lib64", "/usr/lib/X11*", "/usr/lib64/X11*", "/usr/local/X11*", "/usr/openwin/lib" ]
+   paths = []
+   opt_paths.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'), File::FNM_CASEFOLD))}
+   defaults.compact.each{|path| paths.concat(Dir.glob(path.strip.chomp('/'), File::FNM_CASEFOLD))}