From 7ef51c14daba4fce089efaa119c989ac22b431c0 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@fedoraproject.org>
Date: Thu, 8 Jun 2006 07:53:37 +0000
Subject: [PATCH] - ruby-deprecated-sitelib-search-path.patch: correct the
 order of search     path.

---
 ruby-deprecated-search-path.patch         | 4 ++--
 ruby-deprecated-sitelib-search-path.patch | 6 +++---
 ruby.spec                                 | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ruby-deprecated-search-path.patch b/ruby-deprecated-search-path.patch
index f89da8c..3b937b2 100644
--- a/ruby-deprecated-search-path.patch
+++ b/ruby-deprecated-search-path.patch
@@ -36,8 +36,8 @@ diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
 +#ifdef RUBY_DEPRECATED_SITE_LIB
 +    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB));
 +#endif
- #ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
-     ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
+ #ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
+     ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
  #endif
 @@ -308,6 +314,9 @@
  #endif
diff --git a/ruby-deprecated-sitelib-search-path.patch b/ruby-deprecated-sitelib-search-path.patch
index 32b46de..ce5f2ab 100644
--- a/ruby-deprecated-sitelib-search-path.patch
+++ b/ruby-deprecated-sitelib-search-path.patch
@@ -25,14 +25,14 @@ diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
  #endif
      ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
      ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
++#ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
++    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
++#endif
 +#ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
 +    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
 +#endif
 +#ifdef RUBY_DEPRECATED_OLD_SITE_LIB
 +    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB));
-+#endif
-+#ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
-+    ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
 +#endif
  
      ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
diff --git a/ruby.spec b/ruby.spec
index 3cab42d..e3ab266 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -5,7 +5,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	7.fc6
+Release:	8.fc6
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -450,6 +450,9 @@ rm -rf tmp-ruby-docs
 %endif
 
 %changelog
+* Thu Jun  8 2006 Akira TAGOH <tagoh@redhat.com> - 1.8.4-8
+- ruby-deprecated-sitelib-search-path.patch: correct the order of search path.
+
 * Wed Jun  7 2006 Akira TAGOH <tagoh@redhat.com> - 1.8.4-7
 - exclude ppc64 to make ruby-mode package. right now emacs.ppc64 isn't provided
   and buildsys became much stricker.