- ruby-deprecated-sitelib-search-path.patch: correct the order of search

path.
This commit is contained in:
Akira TAGOH 2006-06-08 07:53:37 +00:00
parent ddb078ee02
commit 7ef51c14da
3 changed files with 9 additions and 6 deletions

View File

@ -36,8 +36,8 @@ diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
+#ifdef RUBY_DEPRECATED_SITE_LIB +#ifdef RUBY_DEPRECATED_SITE_LIB
+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB)); + ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB));
+#endif +#endif
#ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB #ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB)); ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
#endif #endif
@@ -308,6 +314,9 @@ @@ -308,6 +314,9 @@
#endif #endif

View File

@ -25,14 +25,14 @@ diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
#endif #endif
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB)); ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB)); 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 +#ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB)); + ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
+#endif +#endif
+#ifdef RUBY_DEPRECATED_OLD_SITE_LIB +#ifdef RUBY_DEPRECATED_OLD_SITE_LIB
+ ruby_incpush(RUBY_RELATIVE(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 +#endif
ruby_incpush(RUBY_RELATIVE(RUBY_LIB)); ruby_incpush(RUBY_RELATIVE(RUBY_LIB));

View File

@ -5,7 +5,7 @@
Name: ruby Name: ruby
Version: 1.8.4 Version: 1.8.4
Release: 7.fc6 Release: 8.fc6
License: Ruby License/GPL - see COPYING License: Ruby License/GPL - see COPYING
URL: http://www.ruby-lang.org/ URL: http://www.ruby-lang.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
@ -450,6 +450,9 @@ rm -rf tmp-ruby-docs
%endif %endif
%changelog %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 * 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 - exclude ppc64 to make ruby-mode package. right now emacs.ppc64 isn't provided
and buildsys became much stricker. and buildsys became much stricker.