OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ruby?expand=0&rev=5

ruby-1.8.2-tcltk-multilib.patch

@@ -1,22 +0,0 @@
-Index: ext/tk/extconf.rb
-===================================================================
---- ext/tk/extconf.rb.orig
-+++ ext/tk/extconf.rb
-@@ -48,7 +48,7 @@ tcllib = with_config("tcllib")
- stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
- 
- def find_tcl(tcllib, stubs)
--  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
-+  paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"]
-   if stubs
-     func = "Tcl_InitStubs"
-     lib = "tclstub"
-@@ -273,7 +273,7 @@ end
- if tcltk_framework || 
-    (have_header("tcl.h") && have_header("tk.h") &&
-     (is_win32 || find_library("X11", "XOpenDisplay",
--      "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib")) &&
-+      "/usr/X11/lib64", "/usr/X11/lib", "/usr/lib64/X11", "/usr/lib/X11", "/usr/X11R6/lib64", "/usr/X11R6/lib", "/usr/openwin/lib64", "/usr/openwin/lib")) &&
-     find_tcl(tcllib, stubs) &&
-     find_tk(tklib, stubs))
-   $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs

ruby-1.8.5-p12.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7775cef022f5788fa6c1c65f638860676b63fbdcb6a57873e71fc6b3a4143afe
-size 3859578

ruby-1.8.5_linkerflags.patch

@@ -1,16 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in.orig
-+++ configure.in
-@@ -1339,9 +1339,9 @@
- fi
- if test "$enable_rpath" = yes; then
-     if test "$GCC" = yes; then
--       LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
-+       LIBRUBYARG_SHARED='-Wl,-R -Wl,$(libdir) -L$(libdir) '"$LIBRUBYARG_SHARED"
-     else
--       LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) -L. '"$LIBRUBYARG_SHARED"
-+       LIBRUBYARG_SHARED='-R $(libdir) -L$(libdir) '"$LIBRUBYARG_SHARED"
-     fi
- fi
- 

ruby-1.8.6-p36.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9b9715235580e1ba9248aeef5f9a8d329824b04d1b0af2a30ab74d3123c801c
+size 3905975

ruby-1.8.6.p36_gc.patch

@@ -2,16 +2,16 @@ Index: gc.c
 ===================================================================
 --- gc.c.orig
 +++ gc.c
-@@ -422,7 +422,7 @@
+@@ -425,7 +425,7 @@ unsigned int _stacksize = 262144;
  # define STACK_LEVEL_MAX (_stacksize - 4096)
  # undef HAVE_GETRLIMIT
- #elif defined(HAVE_GETRLIMIT)
+ #elif defined(HAVE_GETRLIMIT) || defined(_WIN32)
 -static unsigned int STACK_LEVEL_MAX = 655300;
 +static unsigned long STACK_LEVEL_MAX = 655300;
  #else
  # define STACK_LEVEL_MAX 655300
  #endif
-@@ -482,7 +482,7 @@
+@@ -485,7 +485,7 @@ stack_grow_direction(addr)
      (ret) = (STACK_LENGTH > STACK_LEVEL_MAX + GC_WATER_MARK);\
  } while (0)
  
@@ -24,7 +24,7 @@ Index: intern.h
 ===================================================================
 --- intern.h.orig
 +++ intern.h
-@@ -234,7 +234,7 @@
+@@ -238,7 +238,7 @@ VALUE rb_file_directory_p _((VALUE,VALUE
  /* gc.c */
  NORETURN(void rb_memerror __((void)));
  int ruby_stack_check _((void));

ruby-1.8.6.p36_lib64.patch

@@ -1,8 +1,8 @@
 Index: configure.in
 ===================================================================
---- configure.in.orig	2006-12-06 11:58:08.000000000 +0100
+--- configure.in.orig
-+++ configure.in	2007-02-12 16:52:09.790878221 +0100
++++ configure.in
-@@ -1183,7 +1183,7 @@ rb_cv_missing_fconvert=yes, rb_cv_missin
+@@ -1235,7 +1235,7 @@ rb_cv_missing_fconvert=yes, rb_cv_missin
      if test "$rb_cv_missing_fconvert" = yes; then
        AC_DEFINE(MISSING_FCONVERT)
      fi
@@ -11,7 +11,7 @@ Index: configure.in
      CFLAGS="$CFLAGS -fansi-only"
      XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
      EXEEXT=.x
-@@ -1510,7 +1510,7 @@ case "$target_os" in
+@@ -1548,7 +1548,7 @@ case "$target_os" in
      RUBY_LIB_PREFIX="/lib/ruby"
      ;;
    *)
@@ -20,7 +20,7 @@ Index: configure.in
      ;;
  esac
  RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
-@@ -1518,7 +1518,7 @@ RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJO
+@@ -1556,7 +1556,7 @@ RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJO
  AC_ARG_WITH(sitedir,
  	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
              [sitedir=$withval],

ruby-1.8.6.p36_socket_ipv6.patch

@@ -2,7 +2,7 @@ Index: ext/socket/extconf.rb
 ===================================================================
 --- ext/socket/extconf.rb.orig
 +++ ext/socket/extconf.rb
-@@ -36,6 +36,7 @@
+@@ -43,6 +43,7 @@ if enable_config("ipv6", default_ipv6)
    if checking_for("ipv6") {try_link(<<EOF)}
  #include <sys/types.h>
  #include <sys/socket.h>
@@ -10,7 +10,7 @@ Index: ext/socket/extconf.rb
  main()
  {
    socket(AF_INET6, SOCK_STREAM, 0);
-@@ -157,6 +158,7 @@
+@@ -135,6 +136,7 @@ getaddr_info_ok = enable_config("wide-ge
  #define AF_LOCAL AF_UNIX
  #endif
  

ruby-1.8.6.p36_tcltk-multilib.patch

@@ -0,0 +1,26 @@
+Index: ext/tk/extconf.rb
+===================================================================
+--- ext/tk/extconf.rb.orig
++++ ext/tk/extconf.rb
+@@ -50,7 +50,7 @@ stubs = enable_config("tcltk_stubs") || 
+ use_X = with_config("X11", (! is_win32))
+ 
+ def find_tcl(tcllib, stubs)
+-  paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
++  paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"]
+   if stubs
+     func = "Tcl_InitStubs"
+     lib = "tclstub"
+@@ -276,8 +276,10 @@ end
+ if tcltk_framework || 
+    (have_header("tcl.h") && have_header("tk.h") &&
+       ( !use_X || find_library("X11", "XOpenDisplay",
+-                               "/usr/X11/lib", "/usr/lib/X11", 
+-                               "/usr/X11R6/lib", "/usr/openwin/lib")) &&
++                               "/usr/X11/lib64",     "/usr/X11/lib",
++                               "/usr/lib64/X11",     "/usr/lib/X11",
++                               "/usr/X11R6/lib64",   "/usr/X11R6/lib",
++                               "/usr/openwin/lib64", "/usr/openwin/lib")) &&
+     find_tcl(tcllib, stubs) &&
+     find_tk(tklib, stubs))
+   $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs

ruby-1.8.6.p36_thread_prototype_and_testsuite.patch

@@ -0,0 +1,77 @@
+----------------------------------------------------------------------
+r12540 (orig r12539):  shyouhei | 2007-06-14 17:04:27 +0200
+Changed paths:
+  M  /upstream/branches/ruby_1_8_6/ChangeLog
+  M  /upstream/branches/ruby_1_8_6/test/ruby/suicide.rb (from /upstream/branches/ruby_1_8/test/ruby/suicide.rb:12504)
+  M  /upstream/branches/ruby_1_8_6/test/ruby/test_beginendblock.rb
+  M  /upstream/branches/ruby_1_8_6/version.h
+
+* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
+  get rid of invoking shell.  [ruby-dev:30942]
+
+----------------------------------------------------------------------
+r12568 (orig r12567):  nobu | 2007-06-18 04:28:11 +0200
+Changed paths:
+  M  /upstream/branches/ruby_1_8_6/ChangeLog
+  M  /upstream/branches/ruby_1_8_6/ext/thread/thread.c
+  M  /upstream/branches/ruby_1_8_6/intern.h
+  M  /upstream/branches/ruby_1_8_6/version.h
+
+* intern.h, ext/thread/thread.c: moved prototype of rb_thread_status()
+  to get rid of error in C++.  [ruby-list:43615]
+
+----------------------------------------------------------------------
+=== intern.h
+==================================================================
+--- intern.h	(revision 12539)
++++ intern.h	(revision 12568)
+@@ -204,7 +204,6 @@
+ void rb_thread_polling _((void));
+ void rb_thread_sleep _((int));
+ void rb_thread_sleep_forever _((void));
+-enum rb_thread_status rb_thread_status _((VALUE));
+ VALUE rb_thread_stop _((void));
+ VALUE rb_thread_wakeup _((VALUE));
+ VALUE rb_thread_wakeup_alive _((VALUE));
+=== ext/thread/thread.c
+==================================================================
+--- ext/thread/thread.c	(revision 12539)
++++ ext/thread/thread.c	(revision 12568)
+@@ -14,6 +14,8 @@
+ #include <rubysig.h>
+ #include <node.h>
+ 
++enum rb_thread_status rb_thread_status _((VALUE));
++
+ static VALUE rb_cMutex;
+ static VALUE rb_cConditionVariable;
+ static VALUE rb_cQueue;
+=== test/ruby/suicide.rb
+==================================================================
+--- test/ruby/suicide.rb	(revision 12539)
++++ test/ruby/suicide.rb	(revision 12568)
+@@ -0,0 +1,2 @@
++STDERR.reopen(STDOUT)
++at_exit{Process.kill(:INT, $$)}
+=== test/ruby/test_beginendblock.rb
+==================================================================
+--- test/ruby/test_beginendblock.rb	(revision 12539)
++++ test/ruby/test_beginendblock.rb	(revision 12568)
+@@ -69,15 +69,14 @@
+ 
+   def test_should_propagate_exit_code
+     ruby = EnvUtil.rubybin
+-    assert_equal false, system("#{q(ruby)} -e 'at_exit{exit 2}'")
++    assert_equal false, system(ruby, '-e', 'at_exit{exit 2}')
+     assert_equal 2, $?.exitstatus
+     assert_nil $?.termsig
+   end
+ 
+   def test_should_propagate_signaled
+     ruby = EnvUtil.rubybin
+-    out = IO.popen("#{q(ruby)} -e 'STDERR.reopen(STDOUT);" \
+-		   "at_exit{Process.kill(:INT, $$)}'"){|f|
++    out = IO.popen("#{ruby} #{File.dirname(__FILE__)}/suicide.rb"){|f|
+       f.read
+     }
+     assert_match /Interrupt$/, out

ruby-1.8.6.p36_vendor_ruby.patch

@@ -2,7 +2,7 @@ Index: configure.in
 ===================================================================
 --- configure.in.orig
 +++ configure.in
-@@ -1533,9 +1533,28 @@
+@@ -1571,9 +1571,28 @@ AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB
  AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
  AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
  
@@ -31,7 +31,7 @@ Index: configure.in
  
  configure_args=$ac_configure_args
  AC_SUBST(configure_args)dnl
-@@ -1548,6 +1567,8 @@
+@@ -1586,6 +1605,8 @@ if test "$fat_binary" != no ; then
  
      AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
                   "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
@@ -40,7 +40,7 @@ Index: configure.in
      AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${target_os}")
  else
      arch="${target_cpu}-${target_os}"
-@@ -1555,12 +1576,15 @@
+@@ -1593,12 +1614,15 @@ else
  fi
  
  case "$target_os" in
@@ -62,29 +62,38 @@ Index: instruby.rb
 ===================================================================
 --- instruby.rb.orig
 +++ instruby.rb
-@@ -99,6 +99,8 @@
+@@ -162,6 +162,8 @@ rubylibdir = CONFIG["rubylibdir"]
- archlibdir = with_destdir(CONFIG["archdir"])
+ archlibdir = CONFIG["archdir"]
- sitelibdir = with_destdir(CONFIG["sitelibdir"])
+ sitelibdir = CONFIG["sitelibdir"]
- sitearchlibdir = with_destdir(CONFIG["sitearchdir"])
+ sitearchlibdir = CONFIG["sitearchdir"]
-+vendorlibdir = with_destdir(CONFIG["vendorlibdir"])
++vendorlibdir = CONFIG["vendorlibdir"]
-+vendorarchlibdir = with_destdir(CONFIG["vendorarchdir"])
++vendorarchlibdir = CONFIG["vendorarchdir"]
- mandir = with_destdir(File.join(CONFIG["mandir"], "man"))
+ mandir = File.join(CONFIG["mandir"], "man")
  configure_args = Shellwords.shellwords(CONFIG["configure_args"])
  enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
-@@ -106,7 +108,7 @@
+@@ -202,7 +204,7 @@ if $extout
- lib = CONFIG["LIBRUBY"]
+   extout = "#$extout"
- arc = CONFIG["LIBRUBY_A"]
+   install?(:ext, :arch, :'ext-arch') do
- 
+     puts "installing extension objects"
--makedirs [bindir, libdir, rubylibdir, archlibdir, sitelibdir, sitearchlibdir]
+-    makedirs [archlibdir, sitearchlibdir]
-+makedirs [bindir, libdir, rubylibdir, archlibdir, sitelibdir, sitearchlibdir, vendorlibdir, vendorarchlibdir]
++    makedirs [archlibdir, sitearchlibdir, vendorarchlibdir]
- 
+     if noinst = CONFIG["no_install_files"] and noinst.empty?
- install?(:bin) do
+       noinst = nil
-   ruby_bin = File.join(bindir, ruby_install_name)
+     end
+@@ -210,7 +212,7 @@ if $extout
+   end
+   install?(:ext, :comm, :'ext-comm') do
+     puts "installing extension scripts"
+-    makedirs [rubylibdir, sitelibdir]
++    makedirs [rubylibdir, sitelibdir, vendorlibdir]
+     install_recursive("#{extout}/common", rubylibdir)
+   end
+ end
 Index: Makefile.in
 ===================================================================
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -23,6 +23,8 @@
+@@ -24,6 +24,8 @@ datadir = @datadir@
  arch = @arch@
  sitearch = @sitearch@
  sitedir = @sitedir@
@@ -97,7 +106,7 @@ Index: mkconfig.rb
 ===================================================================
 --- mkconfig.rb.orig
 +++ mkconfig.rb
-@@ -112,6 +112,14 @@
+@@ -143,6 +143,14 @@ print <<EOS
    CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
    CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
    CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
@@ -116,7 +125,7 @@ Index: lib/mkmf.rb
 ===================================================================
 --- lib/mkmf.rb.orig
 +++ lib/mkmf.rb
-@@ -51,6 +51,9 @@
+@@ -51,6 +51,9 @@ $archdir = CONFIG["archdir"]
  $sitedir = CONFIG["sitedir"]
  $sitelibdir = CONFIG["sitelibdir"]
  $sitearchdir = CONFIG["sitearchdir"]
@@ -126,28 +135,7 @@ Index: lib/mkmf.rb
  
  $mswin = /mswin/ =~ RUBY_PLATFORM
  $bccwin = /bccwin/ =~ RUBY_PLATFORM
-@@ -410,7 +413,7 @@
+@@ -1095,6 +1103,7 @@ RUBY_INSTALL_NAME = #{CONFIG['RUBY_INSTA
- 
- def try_func(func, libs, headers = nil, &b)
-   headers = cpp_include(headers)
--  try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
-+  try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
- #{headers}
- /*top*/
- int main() { return 0; }
-@@ -422,6 +425,11 @@
- int main() { return 0; }
- int t() { void ((*volatile p)()); p = (void ((*)()))#{func}; return 0; }
- SRC
-+int #{func}();
-+/*top*/
-+int main() { return 0; }
-+int t() { #{func}(); return 0; }
-+SRC
- end
- 
- def try_var(var, headers = nil, &b)
-@@ -1080,6 +1088,7 @@
  RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
  arch = #{CONFIG['arch']}
  sitearch = #{CONFIG['sitearch']}
@@ -155,20 +143,11 @@ Index: lib/mkmf.rb
  ruby_version = #{Config::CONFIG['ruby_version']}
  ruby = #{$ruby}
  RUBY = $(ruby#{sep})
-@@ -1400,7 +1409,7 @@
-   $CFLAGS = with_config("cflags", arg_config("CFLAGS", config["CFLAGS"])).dup
-   $ARCH_FLAG = with_config("arch_flag", arg_config("ARCH_FLAG", config["ARCH_FLAG"])).dup
-   $CPPFLAGS = with_config("cppflags", arg_config("CPPFLAGS", config["CPPFLAGS"])).dup
--  $LDFLAGS = (with_config("ldflags") || "").dup
-+  $LDFLAGS = with_config("ldflags", arg_config("LDFLAGS", config["LDFLAGS"])).dup
-   $INCFLAGS = "-I$(topdir) -I$(hdrdir) -I$(srcdir)"
-   $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup
-   $LIBEXT = config['LIBEXT'].dup
 Index: ruby.c
 ===================================================================
 --- ruby.c.orig
 +++ ruby.c
-@@ -298,6 +298,13 @@
+@@ -298,6 +298,13 @@ ruby_init_loadpath()
      ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
      ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
  

ruby-1.8.x-autoconf_2.61a.patch

@@ -1,77 +0,0 @@
-Tue Jan 30 12:05:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* mkconfig.rb: autoconf 2.61 support.  [ruby-core:10016]
-
-Index: mkconfig.rb
-===================================================================
---- mkconfig.rb.orig	2006-06-25 16:03:10.000000000 +0200
-+++ mkconfig.rb	2007-02-12 17:53:24.000000000 +0100
-@@ -36,12 +36,39 @@ v_fast = []
- v_others = []
- vars = {}
- has_version = false
-+continued_name = nil
-+continued_line = nil
- File.foreach "config.status" do |line|
-   next if /^#/ =~ line
--  if /^s([%,])@(\w+)@\1(?:\|\#_!!_\#\|)?(.*)\1/ =~ line
-+  name = nil
-+  case line
-+  when /^s([%,])@(\w+)@\1(?:\|\#_!!_\#\|)?(.*)\1/
-     name = $2
-     val = $3.gsub(/\\(?=,)/, '')
--    next if /^(?:ac_.*|DEFS|configure_input)$/ =~ name
-+  when /^S\["(\w+)"\]\s*=\s*"(.*)"\s*(\\)?$/
-+    name = $1
-+    val = $2
-+    if $3
-+      continued_line = []
-+      continued_line << val
-+      continued_name = name
-+      next
-+    end
-+  when /^"(.+)"\s*(\\)?$/
-+    if continued_line
-+      continued_line <<  $1
-+      unless $2
-+	val = continued_line.join("")
-+	name = continued_name
-+	continued_line = nil
-+      end
-+    end
-+  when /^(?:ac_given_)?INSTALL=(.*)/
-+    v_fast << "  CONFIG[\"INSTALL\"] = " + $1 + "\n"
-+  end
-+
-+  if name
-+    next if /^(?:ac_.*|DEFS|configure_input|(?:top_)?srcdir|\w+OBJS)$/ =~ name
-     next if /^\$\(ac_\w+\)$/ =~ val
-     next if /^\$\{ac_\w+\}$/ =~ val
-     next if /^\$ac_\w+$/ =~ val
-@@ -54,6 +81,7 @@ File.foreach "config.status" do |line|
-       name = "ruby_install_name"
-       val = "ruby".sub(/#{ptn[0]}/, ptn[1])
-     end
-+    val.gsub!(/ +(?!-)/, "=") if name == "configure_args" && /mswin32/ =~ RUBY_PLATFORM
-     val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump
-     if /^prefix$/ =~ name
-       val = "(TOPDIR || DESTDIR + #{val})"
-@@ -66,8 +94,6 @@ File.foreach "config.status" do |line|
-       v_others << v
-     end
-     has_version = true if name == "MAJOR"
--  elsif /^(?:ac_given_)?INSTALL=(.*)/ =~ line
--    v_fast << "  CONFIG[\"INSTALL\"] = " + $1 + "\n"
-   end
- #  break if /^CEOF/
- end
-@@ -105,7 +131,8 @@ if $so_name
-   v_fast << "  CONFIG[\"RUBY_SO_NAME\"] = \"" + $so_name + "\"\n"
- end
- 
--print v_fast, v_others
-+print(*v_fast)
-+print(*v_others)
- print <<EOS
-   CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
-   CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"

ruby-rpmlintrc

@@ -0,0 +1,4 @@
+addFilter("ruby-test-suite spurious-executable-perm.*/usr/share/doc/packages/ruby-test-suite/runruby.rb")
+addFilter("ruby non-executable-script /usr/lib.*/ruby/.*")
+addFilter("ruby-doc-html wrong-file-end-of-line-encoding /usr/share/doc/packages/ruby/.*")
+addFilter("ruby-test-suite zero-length /usr/share/doc/packages/ruby-test-suite/.*")

ruby.changes

@@ -1,3 +1,78 @@
+-------------------------------------------------------------------
+Mon Aug  6 03:11:29 CEST 2007 - mrueckert@suse.de
+
+- added ruby-1.8.6.p36_thread_prototype_and_testsuite.patch:
+  pulled two fixes from the 1.8.6 branch:
+  * avoid executing shell in the testsuite
+  * moved definition of rb_thread_status() to avoid errors in C++
+    extensions.
+
+-------------------------------------------------------------------
+Sun Aug  5 22:35:36 CEST 2007 - mrueckert@suse.de
+
+- update to 1.8.6.p36:
+  many bugfixes and library updates. hilights:
+  === Library updates (outstanding ones only)
+  * date
+    * Updated based on date2 4.0.3.
+  * digest
+    * New internal APIs for C and Ruby.
+    * Support for autoloading.
+    * See below for new features and compatibility issues.
+  * nkf
+    * Updated based on nkf as of 2007-01-28.
+  * tk
+    * Tk::X_Scrollable (Y_Scrollable) is renamed to Tk::XScrollable
+      (YScrollable). Tk::X_Scrollable (Y_Scrollable) is still
+      available, but it is an alias name.
+    * Updated Tile extension support based on Tile 0.7.8.
+    * Support --without-X11 configure option for non-X11 versions
+      of Tcl/Tk (e.g. Tcl/Tk Aqua).
+    * New sample script: irbtkw.rbw -- IRB on Ruby/Tk. It has no
+      trouble about STDIN blocking on Windows.
+  === New methods and features
+  * builtin classes
+    * New method: Kernel#instance_variable_defined?
+    * New method: Module#class_variable_defined?
+    * New feature: Dir::glob() can now take an array of glob
+      patterns.
+  * digest
+    * New digest class methods: file
+    * New digest instance methods: clone, reset, new,
+      inspect, digest_length (alias size or length),
+      block_length()
+    * New library: digest/bubblebabble
+    * New function: Digest(name)
+  * fileutils
+    * New option for FileUtils.cp_r(): :remove_destination
+  * thread
+    * Replaced with much faster mutex implementation in C.  The
+      former implementation is available with a configure option
+      `--disable-fastthread'.
+  * webrick
+    * New method: WEBrick::Cookie.parse_set_cookies()
+  === Compatibility issues (excluding feature bug fixes)
+  * builtin classes
+    * String#intern now raises SecurityError when $SAFE level is
+      greater than zero.
+  * fileutils
+    * A minor implementation change breaks Rake <=0.7.1.
+      Updating Rake to 0.7.2 fixes the problem.
+  * digest
+    * The constructor does no longer take an initial string to
+      feed; digest() and hexdigest() now do, instead.
+  For all details see the NEWS or ChangeLog file.
+- rediffed patch ruby-1.8.2-gc.diff
+  new name ruby-1.8.6.p36_gc.patch
+- rediffed patch ruby-1.8.2-tcltk-multilib.patch
+  new name ruby-1.8.6.p36_tcltk-multilib.patch
+- rediffed patch ruby-socket_ipv6.patch
+  new name ruby-1.8.6.p36_socket_ipv6.patch
+- rediffed patch ruby-1.8.5-vendor_ruby.patch
+  new name ruby-1.8.6.p36_vendor_ruby.patch
+- rediffed patch ruby-1.8.5.p12-lib64.diff
+  new name ruby-1.8.6.p36_lib64.patch
+
 -------------------------------------------------------------------
 Fri Mar 30 10:10:10 CEST 2007 - rguenther@suse.de
 

ruby.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package ruby (Version 1.8.5.pl12)
+# spec file for package ruby (Version 1.8.6.p36)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,17 +11,23 @@
 # norootforbuild
 
 Name:           ruby
-Version:        1.8.5.pl12
+Version:        1.8.6.p36
-Release:        6
+Release:        1
-%define pkg_version 1.8.5
+%define pkg_version 1.8.6
-%define patch_level p12
+%define patch_level p36
 %define rb_ver  %(echo %{pkg_version} | sed -e 's/\\\.[0-9]\\\+$//')
 #
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later, http://www.ruby-lang.org/en/LICENSE.txt
 Group:          Development/Languages/Ruby
 #
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison gdbm-devel gperf graphviz libjpeg-devel openssl-devel readline-devel tk-devel
+%if 0%{suse_version} >= 1030
+%define use_fdupes 1
+%endif
+%if 0%{?use_fdupes}
+BuildRequires:  fdupes
+%endif
 %if 0%{?suse_version} < 930
 BuildRequires:  XFree86-devel XFree86-fonts-scalable
 %else
@@ -30,21 +36,22 @@ BuildRequires:  xorg-x11-devel xorg-x11-fonts-scalable
 Provides:       /usr/bin/ruby
 #
 URL:            http://www.ruby-lang.org/
-Source0:        ruby-%{pkg_version}-%{patch_level}.tar.bz2
+Source:         ftp://ftp.ruby-lang.org/pub/ruby/ruby-%{pkg_version}-%{patch_level}.tar.bz2
 Source1:        irb.1
 Source2:        ruby-doc-bundle.tar.bz2
-Patch0:         ruby-1.8.2-gc.diff
+Patch0:         ruby-1.8.6.p36_gc.patch
-Patch1:         ruby-1.8.5.p12-lib64.diff
+Patch1:         ruby-1.8.6.p36_lib64.patch
-Patch2:         ruby-1.8.2-tcltk-multilib.patch
+Patch2:         ruby-1.8.6.p36_tcltk-multilib.patch
-Patch3:         ruby-socket_ipv6.patch
+Patch3:         ruby-1.8.6.p36_socket_ipv6.patch
-Patch4:         ruby-1.8.5_linkerflags.patch
+Patch4:         ruby-1.8.6.p36_thread_prototype_and_testsuite.patch
 # vendor ruby files taken from:
 # http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/
-Patch5:         ruby-1.8.5-vendor_ruby.patch
+Patch5:         ruby-1.8.6.p36_vendor_ruby.patch
-Patch6:         ruby-1.8.x-autoconf_2.61a.patch
 Source3:        site-specific.rb
 Source4:        vendor-specific.rb
 #
+Source5:        ruby-rpmlintrc
+#
 Summary:        An Interpreted Object-Oriented Scripting Language
 
 %description
@@ -84,7 +91,7 @@ Authors:
 
 %package devel
 Group:          Development/Languages/Ruby
-Summary:        Development files to link against Ruby.
+Summary:        Development files to link against Ruby
 Requires:       %{name} = %{version}
 
 %description devel
@@ -198,7 +205,6 @@ Authors:
 %patch3
 %patch4
 %patch5
-%patch6
 find . -type f | xargs -n 1 sed -i "s@#!\s*/usr/local/bin/ruby@#!/usr/bin/ruby@"
 touch parse.y
 
@@ -213,6 +219,20 @@ export CFLAGS="%{optflags} -g -fno-strict-aliasing"
 %{__make} all
 %{__make} -C ext/tk/ all
 #
+# TODO: patch the .document files to include all needed modules.
+#
+export LD_LIBRARY_PATH="$PWD/"
+export RUBYLIB="$PWD:$PWD/lib:$(find $PWD/.ext  $PWD/ext/ -type d |tr '\n' ':')."
+./ruby bin/rdoc                        \
+    --all --line-numbers --ri-system   \
+    --op=ri/%{rb_ver}/system .
+./ruby bin/rdoc                          \
+    --all --line-numbers --charset=UTF-8 \
+    --fmt=html -p --inline-source        \
+    --op=rdoc/html .
+
+%check
+#
 # move the tests out of the way that require an installed ruby
 # we dont have that in our build environment.
 #
@@ -231,7 +251,7 @@ export RUBYLIB="$PWD:$PWD/lib:$(find $PWD/.ext  $PWD/ext/ -type d |tr '\n' ':').
 #
 # run the test suites
 #
-#%{__make} check
+%{__make} check ||:
 #
 # TODO:
 #   the big test suite fails with some weird openssl errors on ppc
@@ -245,16 +265,6 @@ export RUBYLIB="$PWD:$PWD/lib:$(find $PWD/.ext  $PWD/ext/ -type d |tr '\n' ':').
 %ifarch ppc64 s390x
 %{__mv} unused.test/openssl/ test/
 %endif
-#
-# TODO: patch the .document files to include all needed modules.
-#
-./ruby bin/rdoc                        \
-    --all --line-numbers --ri-system   \
-    --op=ri/%{rb_ver}/system .
-./ruby bin/rdoc                          \
-    --all --line-numbers --charset=UTF-8 \
-    --fmt=html -p --inline-source        \
-    --op=rdoc/html .
 
 %install
 %makeinstall
@@ -272,12 +282,12 @@ export RUBYLIB="$PWD:$PWD/lib:$(find $PWD/.ext  $PWD/ext/ -type d |tr '\n' ':').
 %{__install} -m 0644 %{S:4}    %{buildroot}%{_libdir}/%{name}/vendor_%{name}/%{rb_ver}
 #
 %{__cp} -rv                                    \
-    ri/%{rb_ver}/system/* %{buildroot}%{_datadir}/
+    ri/ %{buildroot}%{_datadir}/
-mv %{buildroot}%{_datadir}{,/ri/%{rb_ver}}/created.rid
+#mv %{buildroot}%{_datadir}{,/ri/%{rb_ver}}/created.rid
 %{__cp} -rv                                    \
         COPYING COPYING.ja ChangeLog GPL LEGAL \
         LGPL README README.EXT README.EXT.ja   \
-        README.ja ToDo doc/NEWS                \
+        README.ja ToDo NEWS                    \
     %{buildroot}%{_docdir}/%{name}
 %{__cp} -rv \
     ruby-doc-bundle %{buildroot}%{_docdir}/%{name}
@@ -285,8 +295,13 @@ mv %{buildroot}%{_datadir}{,/ri/%{rb_ver}}/created.rid
     rdoc/html %{buildroot}%{_docdir}/%{name}/ruby-library-docs
 %{__cp} -rv \
     sample %{buildroot}%{_docdir}/%{name}/examples
+sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb
 %{__cp} -r test/ runruby.rb %{buildroot}%{_docdir}/%{name}-test-suite/
 %{__ln_s} -f %{_bindir}/%{name} %{buildroot}%{_docdir}/%{name}-test-suite/%{name}
+%if 0%{?use_fdupes}
+
+%fdupes %{buildroot}
+%endif
 
 %post   -p /sbin/ldconfig
 
@@ -297,9 +312,9 @@ mv %{buildroot}%{_datadir}{,/ri/%{rb_ver}}/created.rid
 %{_bindir}/*
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/%{rb_ver}
+%{_libdir}/lib%{name}.so.%{rb_ver}*
 %dir %{_datadir}/emacs
 %dir %{_datadir}/emacs/site-lisp
-%{_libdir}/lib%{name}.so.%{rb_ver}*
 %{_datadir}/emacs/site-lisp/*
 %{_mandir}/man1/*
 %dir %{_libdir}/%{name}/site_%{name}
@@ -325,6 +340,9 @@ mv %{buildroot}%{_datadir}{,/ri/%{rb_ver}}/created.rid
 %{_libdir}/%{name}/%{rb_ver}/debug.rb
 %{_libdir}/%{name}/%{rb_ver}/delegate.rb
 %{_libdir}/%{name}/%{rb_ver}/bigdecimal/
+%{_libdir}/%{name}/%{rb_ver}/digest.rb
+%dir %{_libdir}/%{name}/%{rb_ver}/digest/
+%{_libdir}/%{name}/%{rb_ver}/digest/sha2.rb
 %{_libdir}/%{name}/%{rb_ver}/dl/
 %{_libdir}/%{name}/%{rb_ver}/drb*
 %{_libdir}/%{name}/%{rb_ver}/e2mmap.rb
@@ -410,6 +428,7 @@ mv %{buildroot}%{_datadir}{,/ri/%{rb_ver}}/created.rid
 %{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/rbconfig.rb
 %{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/[a-sA-s]*.so
 %{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/[u-zU-Z]*.so
+%{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/thread.so
 %{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/digest/
 %{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/io/
 %{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/racc/
@@ -455,6 +474,75 @@ mv %{buildroot}%{_datadir}{,/ri/%{rb_ver}}/created.rid
 %doc %{_docdir}/%{name}/examples
 
 %changelog
+* Mon Aug 06 2007 - mrueckert@suse.de
+- added ruby-1.8.6.p36_thread_prototype_and_testsuite.patch:
+  pulled two fixes from the 1.8.6 branch:
+  * avoid executing shell in the testsuite
+  * moved definition of rb_thread_status() to avoid errors in C++
+  extensions.
+* Sun Aug 05 2007 - mrueckert@suse.de
+- update to 1.8.6.p36:
+  many bugfixes and library updates. hilights:
+  === Library updates (outstanding ones only)
+  * date
+  * Updated based on date2 4.0.3.
+  * digest
+  * New internal APIs for C and Ruby.
+  * Support for autoloading.
+  * See below for new features and compatibility issues.
+  * nkf
+  * Updated based on nkf as of 2007-01-28.
+  * tk
+  * Tk::X_Scrollable (Y_Scrollable) is renamed to Tk::XScrollable
+  (YScrollable). Tk::X_Scrollable (Y_Scrollable) is still
+  available, but it is an alias name.
+  * Updated Tile extension support based on Tile 0.7.8.
+  * Support --without-X11 configure option for non-X11 versions
+  of Tcl/Tk (e.g. Tcl/Tk Aqua).
+  * New sample script: irbtkw.rbw -- IRB on Ruby/Tk. It has no
+  trouble about STDIN blocking on Windows.
+  === New methods and features
+  * builtin classes
+  * New method: Kernel#instance_variable_defined?
+  * New method: Module#class_variable_defined?
+  * New feature: Dir::glob() can now take an array of glob
+  patterns.
+  * digest
+  * New digest class methods: file
+  * New digest instance methods: clone, reset, new,
+  inspect, digest_length (alias size or length),
+  block_length()
+  * New library: digest/bubblebabble
+  * New function: Digest(name)
+  * fileutils
+  * New option for FileUtils.cp_r(): :remove_destination
+  * thread
+  * Replaced with much faster mutex implementation in C.  The
+  former implementation is available with a configure option
+  `--disable-fastthread'.
+  * webrick
+  * New method: WEBrick::Cookie.parse_set_cookies()
+  === Compatibility issues (excluding feature bug fixes)
+  * builtin classes
+  * String#intern now raises SecurityError when $SAFE level is
+  greater than zero.
+  * fileutils
+  * A minor implementation change breaks Rake <=0.7.1.
+  Updating Rake to 0.7.2 fixes the problem.
+  * digest
+  * The constructor does no longer take an initial string to
+  feed; digest() and hexdigest() now do, instead.
+  For all details see the NEWS or ChangeLog file.
+- rediffed patch ruby-1.8.2-gc.diff
+  new name ruby-1.8.6.p36_gc.patch
+- rediffed patch ruby-1.8.2-tcltk-multilib.patch
+  new name ruby-1.8.6.p36_tcltk-multilib.patch
+- rediffed patch ruby-socket_ipv6.patch
+  new name ruby-1.8.6.p36_socket_ipv6.patch
+- rediffed patch ruby-1.8.5-vendor_ruby.patch
+  new name ruby-1.8.6.p36_vendor_ruby.patch
+- rediffed patch ruby-1.8.5.p12-lib64.diff
+  new name ruby-1.8.6.p36_lib64.patch
 * Fri Mar 30 2007 - rguenther@suse.de
 - add bison BuildRequires
 - add emacs site-lisp directories