rpms/ruby/devel ruby-tcltk-multilib.patch, 1.1, 1.2 ruby.spec, 1.51, 1.52

[fedora-cvs-commits at redhat.com]

Author: tagoh

Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26883

Modified Files:
	ruby-tcltk-multilib.patch ruby.spec 
Log Message:
* Wed Jan  4 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-2
- ruby-tcltk-multilib.patch: fixed a typo.

ruby-tcltk-multilib.patch:
 extconf.rb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Index: ruby-tcltk-multilib.patch
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby-tcltk-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-tcltk-multilib.patch	16 Dec 2005 10:46:41 -0000	1.1
+++ ruby-tcltk-multilib.patch	4 Jan 2006 09:18:52 -0000	1.2
@@ -6,7 +6,7 @@
  
  def find_tcl(tcllib, stubs)
 -  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
      func = "Tcl_InitStubs"
      lib = "tclstub"
@@ -15,7 +15,7 @@
  
  def find_tk(tklib, stubs)
 -  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
      func = "Tk_InitStubs"
      lib = "tkstub"
@@ -24,7 +24,7 @@
     (have_header("tcl.h") && have_header("tk.h") &&
      (is_win32 || find_library("X11", "XOpenDisplay",
 -      "/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_tk(tklib, stubs))
    $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs


Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ruby.spec	27 Dec 2005 03:53:40 -0000	1.51
+++ ruby.spec	4 Jan 2006 09:18:52 -0000	1.52
@@ -4,7 +4,7 @@
 
 Name:		ruby
 Version:	1.8.4
-Release:	1
+Release:	2
 License:	Distributable
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -418,6 +418,9 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
+* Wed Jan  4 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-2
+- ruby-tcltk-multilib.patch: fixed a typo.
+
 * Tue Dec 27 2005 Akira TAGOH <tagoh at redhat.com> - 1.8.4-1
 - New upstream release.
   - fixed a missing return statement. (#140833)