From 3feca6f65355bad9dc010457ecd81adf2e85fd31 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@fedoraproject.org>
Date: Tue, 26 Sep 2006 09:39:59 +0000
Subject: [PATCH] - fixed rbconfig.rb to refer to DESTDIR for sitearchdir.
 (#207311)

---
 ruby-rubyprefix.patch | 7 +++----
 ruby.spec             | 7 +++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ruby-rubyprefix.patch b/ruby-rubyprefix.patch
index fc54018..452ef2f 100644
--- a/ruby-rubyprefix.patch
+++ b/ruby-rubyprefix.patch
@@ -31,7 +31,7 @@ diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
              [sitedir='${prefix}/lib/ruby/site_ruby'])
 -SITE_DIR="`eval \"echo ${sitedir}\"`"
 +SITE_DIR="`eval \"echo ${sitedir}\" | sed -e s/lib64/lib/`"
-+_fc_sitedir=${sitedir}
++_fc_sitedir="\$(DESTDIR)${sitedir}"
 +SITE_DIR2="`eval \"echo ${_fc_sitedir}\"`"
 +sitedir="`eval \"echo ${sitedir}\" | sed -e s/lib64/lib/`"
  case "$target_os" in
@@ -85,11 +85,10 @@ diff -ruN ruby-1.8.4.orig/mkconfig.rb ruby-1.8.4/mkconfig.rb
    CONFIG["ruby_version"] = "$(MAJOR).$(MINOR)"
 -  CONFIG["rubylibdir"] = "$(libdir)/ruby/$(ruby_version)"
 -  CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
--  CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
--  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
 +  CONFIG["rubylibdir"] = "$(prefix)/lib/ruby/$(ruby_version)"
 +  CONFIG["archdir"] = "$(libdir)/ruby/$(ruby_version)/$(arch)"
-+  CONFIG["sitelibdir"] = "$(prefix)/lib/ruby/site_ruby/$(ruby_version)"
+   CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
+-  CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
 +  CONFIG["sitearchdir"] = "$(_fc_sitedir)/$(ruby_version)/$(sitearch)"
    CONFIG["topdir"] = File.dirname(__FILE__)
    MAKEFILE_CONFIG = {}
diff --git a/ruby.spec b/ruby.spec
index 82c5884..3bce9eb 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -5,7 +5,7 @@
 
 Name:		ruby
 Version:	1.8.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -295,7 +295,7 @@ _cpu=`echo %{_target_cpu} | sed 's/^ppc/powerpc/'`
 # generate ri doc
 rubybuilddir=$RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}
 LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} RUBYLIB=$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}:$RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os} make -C $rubybuilddir DESTDIR=$RPM_BUILD_ROOT install-doc
-#DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/ -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}
+#DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $rubybuilddir -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/$_cpu-%{_target_os}/ -I $rubybuilddir/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $rubybuilddir
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{sitedir2}/%{rubyxver}
 %{__mkdir_p} $RPM_BUILD_ROOT%{sitedir}/%{rubyxver}/$_cpu-%{_target_os}
@@ -459,6 +459,9 @@ rm -rf tmp-ruby-docs
 %endif
 
 %changelog
+* Tue Sep 26 2006 Akira TAGOH <tagoh@redhat.com> - 1.8.5-2
+- fixed rbconfig.rb to refer to DESTDIR for sitearchdir. (#207311)
+
 * Mon Aug 28 2006 Akira TAGOH <tagoh@redhat.com> - 1.8.5-1
 - New upstream release.
 - removed the unnecessary patches: