From 35188975c5d8f4cb0f1d51a83e699567693afce5 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Oct 23 2009 17:25:54 +0000
Subject: - Update to 1.8.6 patchlevel 383 (bug 520063)


---

diff --git a/.cvsignore b/.cvsignore
index 9be1be4..dd58fe3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
 ruby-refm-rdp-1.8.2-ja-html.tar.gz
 rubyfaq-990927.tar.gz
 rubyfaq-jp-990927.tar.gz
-ruby-1.8.6-p369.tar.bz2
+ruby-1.8.6-p383.tar.bz2
diff --git a/ruby-1.8.6-p383-rubyprefix.patch b/ruby-1.8.6-p383-rubyprefix.patch
new file mode 100644
index 0000000..1f0fa43
--- /dev/null
+++ b/ruby-1.8.6-p383-rubyprefix.patch
@@ -0,0 +1,97 @@
+diff -ur ruby-1.8.6-p383.0-deadcode/configure.in ruby-1.8.6-p383/configure.in
+--- ruby-1.8.6-p383.0-deadcode/configure.in	2009-07-20 15:24:22.000000000 +0200
++++ ruby-1.8.6-p383/configure.in	2009-10-22 16:37:13.729623476 +0200
+@@ -1613,6 +1613,13 @@
+     rubyw_install_name="$RUBYW_INSTALL_NAME"
+     ;;
+ esac
++
++AC_ARG_WITH(ruby-prefix,
++	AC_HELP_STRING([--with-ruby-prefix], [build ruby with the special library prefix.])
++	,,
++	with_ruby_prefix=no)
++
++if test "x$with_ruby_prefix" = "x"; then
+ case "$target_os" in
+   cygwin*|mingw*|*djgpp*|os2-emx*)
+     RUBY_LIB_PREFIX="/lib/ruby"
+@@ -1621,20 +1628,30 @@
+     RUBY_LIB_PREFIX="`eval "echo ${libdir}"`/ruby"
+     ;;
+ esac
++else
++    RUBY_LIB_PREFIX="${with_ruby_prefix}/ruby"
++fi
+ RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
++RUBY_LIB_PATH2="${libdir}/ruby/${MAJOR}.${MINOR}"
+ 
+ AC_ARG_WITH(sitedir,
+ 	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
+             [sitedir=$withval],
+             [sitedir="`eval "echo ${libdir}"`/ruby/site_ruby"])
+-SITE_DIR=`eval echo \\"${sitedir}\\"`
++SITE_DIR=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
++_fc_sitedir="\$(DESTDIR)${sitedir}"
++SITE_DIR2=`eval echo \\"${_fc_sitedir}\\"`
++sitedir=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
++
+ case "$target_os" in
+   cygwin*|mingw*|*djgpp*|os2-emx*)
+     RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
+     RUBY_SITE_LIB_PATH="$SITE_DIR";;
+   *)
+-    RUBY_SITE_LIB_PATH="$SITE_DIR";;
++    RUBY_SITE_LIB_PATH="$SITE_DIR";
++    RUBY_SITE_LIB_PATH2="$SITE_DIR2";;
+ esac
++RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
+ RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
+ 
+ AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
+@@ -1644,6 +1661,7 @@
+ AC_SUBST(arch)dnl
+ AC_SUBST(sitearch)dnl
+ AC_SUBST(sitedir)dnl
++AC_SUBST(_fc_sitedir)dnl
+ 
+ configure_args=$ac_configure_args
+ AC_SUBST(configure_args)dnl
+@@ -1652,7 +1670,7 @@
+     arch="fat-${target_os}"
+ 
+     AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
+-                 "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
++                 "${RUBY_LIB_PATH2}/" __ARCHITECTURE__ "-${target_os}")
+ 
+     AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
+                  "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
+@@ -1667,8 +1685,8 @@
+   *) sitearch="${arch}" ;;
+ esac
+ 
+-AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
+-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
++AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}")
++AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}")
+ 
+ AC_ARG_WITH(search-path,
+ 		[  --with-search-path=DIR specify the additional search path],
+Only in ruby-1.8.6-p383/: configure.in.orig
+Only in ruby-1.8.6-p383/: configure.in.rej
+diff -ur ruby-1.8.6-p383.0-deadcode/mkconfig.rb ruby-1.8.6-p383/mkconfig.rb
+--- ruby-1.8.6-p383.0-deadcode/mkconfig.rb	2008-06-07 18:37:10.000000000 +0200
++++ ruby-1.8.6-p383/mkconfig.rb	2009-10-22 16:30:55.776872493 +0200
+@@ -139,10 +139,10 @@
+ print(*v_others)
+ print <<EOS
+   CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
+-  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
+-  CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
++  CONFIG["rubylibdir"] = "$(prefix)/lib/ruby/$(ruby_version)"
++  CONFIG["archdir"] = "$(libdir)/ruby/$(ruby_version)/$(arch)"
+   CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
+-  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
++  CONFIG["sitearchdir"] = "$(_fc_sitedir)/$(ruby_version)/$(sitearch)"
+   CONFIG["topdir"] = File.dirname(__FILE__)
+   MAKEFILE_CONFIG = {}
+   CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
diff --git a/ruby-rubyprefix.patch b/ruby-rubyprefix.patch
deleted file mode 100644
index 8d1bd0c..0000000
--- a/ruby-rubyprefix.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -pruN ruby-1.8.6-p287.orig/configure.in ruby-1.8.6-p287/configure.in
---- ruby-1.8.6-p287.orig/configure.in	2008-07-13 00:03:28.000000000 +0900
-+++ ruby-1.8.6-p287/configure.in	2008-08-14 01:08:00.000000000 +0900
-@@ -1608,6 +1608,13 @@ case "$target_os" in
-     rubyw_install_name="$RUBYW_INSTALL_NAME"
-     ;;
- esac
-+
-+AC_ARG_WITH(ruby-prefix,
-+	AC_HELP_STRING([--with-ruby-prefix], [build ruby with the special library prefix.])
-+	,,
-+	with_ruby_prefix=no)
-+
-+if test "x$with_ruby_prefix" = "x"; then
- case "$target_os" in
-   cygwin*|mingw*|*djgpp*|os2-emx*)
-     RUBY_LIB_PREFIX="/lib/ruby"
-@@ -1616,20 +1623,29 @@ case "$target_os" in
-     RUBY_LIB_PREFIX="${prefix}/lib/ruby"
-     ;;
- esac
-+else
-+	RUBY_LIB_PREFIX="${with_ruby_prefix}/ruby"
-+fi
- RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
-+RUBY_LIB_PATH2="${libdir}/ruby/${MAJOR}.${MINOR}"
- 
- AC_ARG_WITH(sitedir,
- 	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
-             [sitedir=$withval],
-             [sitedir='${prefix}/lib/ruby/site_ruby'])
--SITE_DIR=`eval echo \\"${sitedir}\\"`
-+SITE_DIR=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
-+_fc_sitedir="\$(DESTDIR)${sitedir}"
-+SITE_DIR2=`eval echo \\"${_fc_sitedir}\\"`
-+sitedir=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
- case "$target_os" in
-   cygwin*|mingw*|*djgpp*|os2-emx*)
-     RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
-     RUBY_SITE_LIB_PATH="$SITE_DIR";;
-   *)
--    RUBY_SITE_LIB_PATH="$SITE_DIR";;
-+    RUBY_SITE_LIB_PATH="$SITE_DIR";
-+    RUBY_SITE_LIB_PATH2="$SITE_DIR2";;
- esac
-+RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
- RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
- 
- AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
-@@ -1639,6 +1655,7 @@ AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RU
- AC_SUBST(arch)dnl
- AC_SUBST(sitearch)dnl
- AC_SUBST(sitedir)dnl
-+AC_SUBST(_fc_sitedir)dnl
- 
- configure_args=$ac_configure_args
- AC_SUBST(configure_args)dnl
-@@ -1647,7 +1664,7 @@ if test "$fat_binary" != no ; then
-     arch="fat-${target_os}"
- 
-     AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
--                 "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
-+                 "${RUBY_LIB_PATH2}/" __ARCHITECTURE__ "-${target_os}")
- 
-     AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
-                  "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
-@@ -1662,8 +1679,8 @@ case "$target_os" in
-   *) sitearch="${arch}" ;;
- esac
- 
--AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
--AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
-+AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH2}/${arch}")
-+AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH3}/${sitearch}")
- 
- AC_ARG_WITH(search-path,
- 		[  --with-search-path=DIR specify the additional search path],
-diff -pruN ruby-1.8.6-p287.orig/mkconfig.rb ruby-1.8.6-p287/mkconfig.rb
---- ruby-1.8.6-p287.orig/mkconfig.rb	2008-06-08 01:37:10.000000000 +0900
-+++ ruby-1.8.6-p287/mkconfig.rb	2008-08-14 01:08:00.000000000 +0900
-@@ -139,10 +139,10 @@ print(*v_fast)
- print(*v_others)
- print <<EOS
-   CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
--  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
--  CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
-+  CONFIG["rubylibdir"] = "$(prefix)/lib/ruby/$(ruby_version)"
-+  CONFIG["archdir"] = "$(libdir)/ruby/$(ruby_version)/$(arch)"
-   CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
--  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
-+  CONFIG["sitearchdir"] = "$(_fc_sitedir)/$(ruby_version)/$(sitearch)"
-   CONFIG["topdir"] = File.dirname(__FILE__)
-   MAKEFILE_CONFIG = {}
-   CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
diff --git a/ruby.spec b/ruby.spec
index e44d5ce..da6cb31 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,6 +1,6 @@
 %define	rubyxver	1.8
 %define	rubyver		1.8.6
-%define _patchlevel	369
+%define _patchlevel	383
 %define dotpatchlevel	%{?_patchlevel:.%{_patchlevel}}
 %define patchlevel	%{?_patchlevel:-p%{_patchlevel}}
 %define	arcver		%{rubyver}%{?patchlevel}
@@ -16,7 +16,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	5%{?dist}
+Release:	2%{?dist}
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -39,7 +39,7 @@ Source4:	irb.1
 Source10:	ruby-mode-init.el
 
 Patch1:		ruby-deadcode.patch
-Patch20:	ruby-rubyprefix.patch
+Patch20:	ruby-1.8.6-p383-rubyprefix.patch
 Patch21:	ruby-deprecated-sitelib-search-path.patch
 Patch22:	ruby-deprecated-search-path.patch
 Patch23:	ruby-multilib.patch
@@ -548,6 +548,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_emacs_sitestartdir}/ruby-mode-init.el
 
 %changelog
+* Sat Oct 24 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.8.6.383-2
+- Update to 1.8.6 patchlevel 383 (bug 520063)
+
 * Wed Oct 14 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.8.6.369-5
 - Much better idea for Patch31 provided by Akira TAGOH <tagoh@redhat.com>
 
diff --git a/sources b/sources
index 34e5163..a667a08 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 b6dd396f513efeb7864685c840f9643a  ruby-refm-rdp-1.8.2-ja-html.tar.gz
 634c25b14e19925d10af3720d72e8741  rubyfaq-990927.tar.gz
 4fcec898f51d8371cc42d0a013940469  rubyfaq-jp-990927.tar.gz
-c3c1f3dd0dfbd2e17a04e59c2f12cfc8  ruby-1.8.6-p369.tar.bz2
+a48703cd982b9f0e3002700a50b0e88e  ruby-1.8.6-p383.tar.bz2