rpms/ruby
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- ruby-tcltk-multilib.patch: fixed a typo.

Browse Source
This commit is contained in:
Akira TAGOH 2006-01-04 09:18:52 +00:00
parent c4b9446727
commit b147747d75
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruby-tcltk-multilib.patch
View File

@ -6,7 +6,7 @@ diff -ruN ruby-1.8.4.orig/ext/tk/extconf.rb ruby-1.8.4/ext/tk/extconf.rb
def find_tcl(tcllib, stubs) def find_tcl(tcllib, stubs)
- paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] - 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"] + paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"]
if stubs if stubs
func = "Tcl_InitStubs" func = "Tcl_InitStubs"
lib = "tclstub" lib = "tclstub"
@ -15,7 +15,7 @@ diff -ruN ruby-1.8.4.orig/ext/tk/extconf.rb ruby-1.8.4/ext/tk/extconf.rb
def find_tk(tklib, stubs) def find_tk(tklib, stubs)
- paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] - 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"] + paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"]
if stubs if stubs
func = "Tk_InitStubs" func = "Tk_InitStubs"
lib = "tkstub" lib = "tkstub"
@ -24,7 +24,7 @@ diff -ruN ruby-1.8.4.orig/ext/tk/extconf.rb ruby-1.8.4/ext/tk/extconf.rb
(have_header("tcl.h") && have_header("tk.h") && (have_header("tcl.h") && have_header("tk.h") &&
(is_win32 || find_library("X11", "XOpenDisplay", (is_win32 || find_library("X11", "XOpenDisplay",
- "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib")) && - "/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")) && + "/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_tcl(tcllib, stubs) &&
find_tk(tklib, stubs)) find_tk(tklib, stubs))
$CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs

5
ruby.spec
View File

@ -4,7 +4,7 @@
Name: ruby Name: ruby
Version: 1.8.4 Version: 1.8.4
Release: 1 Release: 2
License: Distributable License: Distributable
URL: http://www.ruby-lang.org/ URL: http://www.ruby-lang.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-root
@ -418,6 +418,9 @@ rm -rf tmp-ruby-docs
%dir %{_datadir}/emacs/site-lisp/ruby-mode %dir %{_datadir}/emacs/site-lisp/ruby-mode
%changelog %changelog
* Wed Jan 4 2006 Akira TAGOH <tagoh@redhat.com> - 1.8.4-2
- ruby-tcltk-multilib.patch: fixed a typo.
* Tue Dec 27 2005 Akira TAGOH <tagoh@redhat.com> - 1.8.4-1 * Tue Dec 27 2005 Akira TAGOH <tagoh@redhat.com> - 1.8.4-1
- New upstream release. - New upstream release.
- fixed a missing return statement. (#140833) - fixed a missing return statement. (#140833)