[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/ruby/FC-4 ruby-1.8.2-tcltk-multilib.patch, NONE, 1.1 ruby.spec, 1.30, 1.31



Author: tagoh

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

Modified Files:
	ruby.spec 
Added Files:
	ruby-1.8.2-tcltk-multilib.patch 
Log Message:
* Thu Jan 16 2005 Akira TAGOH <tagoh redhat com> - 1.8.2-7.fc4.1
- ruby-1.8.2-tcltk-multilib.patch: applied to get tcltklib.so built. (#160194)

ruby-1.8.2-tcltk-multilib.patch:
 extconf.rb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ruby-1.8.2-tcltk-multilib.patch ---
diff -ruN ruby-1.8.2.orig/ext/tcltklib/extconf.rb ruby-1.8.2/ext/tcltklib/extconf.rb
--- ruby-1.8.2.orig/ext/tcltklib/extconf.rb	2004-12-23 13:16:43.000000000 +0900
+++ ruby-1.8.2/ext/tcltklib/extconf.rb	2005-06-16 21:39:40.000000000 +0900
@@ -27,7 +27,7 @@
 stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs")
 
 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"]
   if stubs
     func = "Tcl_InitStubs"
     lib = "tclstub"
@@ -243,7 +243,7 @@
 if mac_need_framework || 
    (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")) &&
     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/FC-4/ruby.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ruby.spec	6 Apr 2005 18:29:08 -0000	1.30
+++ ruby.spec	16 Jun 2005 13:06:44 -0000	1.31
@@ -4,7 +4,7 @@
 
 Name:		ruby
 Version:	1.8.2
-Release: 7
+Release: 7.fc4.1
 License:	Distributable
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -24,6 +24,7 @@
 Patch1:		ruby-1.8.0-multilib.patch
 Patch2:		ruby-1.8.2-strscan-memset.patch
 Patch3:		ruby-1.8.2-deadcode.patch
+Patch4:		ruby-1.8.2-tcltk-multilib.patch
 
 Summary:	An interpreter of object-oriented scripting language
 Group:		Development/Languages
@@ -127,6 +128,9 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%ifarch sparc64 ppc64 s390x x86_64
+%patch4 -p1
+%endif
 popd
 
 %build
@@ -407,6 +411,9 @@
 %dir %{_datadir}/emacs/site-lisp/ruby-mode
 
 %changelog
+* Thu Jan 16 2005 Akira TAGOH <tagoh redhat com> - 1.8.2-7.fc4.1
+- ruby-1.8.2-tcltk-multilib.patch: applied to get tcltklib.so built. (#160194)
+
 * Thu Apr  7 2005 Akira TAGOH <tagoh redhat com> - 1.8.2-7
 - ruby-1.8.2-deadcode.patch: removed the dead code from the source. (#146108)
 - make sure that all documentation files in ruby-docs are the world-


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]