rpms/ruby/FC-4 ruby-tcltk-multilib.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 ruby-1.8.2-deadcode.patch, 1.2, 1.3 ruby.spec, 1.35, 1.36 sources, 1.11, 1.12 ruby-1.8.2-strscan-memset.patch, 1.1, NONE ruby-1.8.2-tcltk-multilib.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 4 09:13:08 UTC 2006
Author: tagoh
Update of /cvs/dist/rpms/ruby/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv13260
Modified Files:
.cvsignore ruby-1.8.2-deadcode.patch ruby.spec sources
Added Files:
ruby-tcltk-multilib.patch
Removed Files:
ruby-1.8.2-strscan-memset.patch
ruby-1.8.2-tcltk-multilib.patch
Log Message:
* Wed Jan 4 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-1.fc4
- New upstream release (#176670)
- Kernel module ri documents are available. (#174923)
- ruby-1.8.2-strscan-memset.patch: removed.
- moved the documents from ruby-libs to ruby-docs, which contains the arch
specific thing and to be multilib support.
ruby-tcltk-multilib.patch:
extconf.rb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE ruby-tcltk-multilib.patch ---
diff -ruN ruby-1.8.4.orig/ext/tk/extconf.rb ruby-1.8.4/ext/tk/extconf.rb
--- ruby-1.8.4.orig/ext/tk/extconf.rb 2005-11-02 20:28:40.000000000 +0900
+++ ruby-1.8.4/ext/tk/extconf.rb 2005-12-16 19:44:57.000000000 +0900
@@ -48,7 +48,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"
@@ -71,7 +71,7 @@
end
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"]
if stubs
func = "Tk_InitStubs"
lib = "tkstub"
@@ -274,7 +274,7 @@
if tcltk_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: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 26 Sep 2005 11:02:36 -0000 1.12
+++ .cvsignore 4 Jan 2006 09:13:04 -0000 1.13
@@ -6,3 +6,4 @@
*.rpm
ruby-1.8.2.tar.gz
ruby-1.8.3.tar.gz
+ruby-1.8.4.tar.gz
ruby-1.8.2-deadcode.patch:
ext/bigdecimal/bigdecimal.c | 2 ++
ext/pty/pty.c | 2 ++
parse.y | 4 ++++
regex.c | 4 ++++
4 files changed, 12 insertions(+)
Index: ruby-1.8.2-deadcode.patch
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-4/ruby-1.8.2-deadcode.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ruby-1.8.2-deadcode.patch 26 Sep 2005 11:02:56 -0000 1.2
+++ ruby-1.8.2-deadcode.patch 4 Jan 2006 09:13:04 -0000 1.3
@@ -34,75 +34,6 @@
/* ruby function: getpty */
static VALUE
-diff -ruN ruby-1.8.2.orig/ext/tcltklib/tcltklib.c ruby-1.8.2/ext/tcltklib/tcltklib.c
---- ruby-1.8.2.orig/ext/tcltklib/tcltklib.c 2004-12-23 13:16:42.000000000 +0900
-+++ ruby-1.8.2/ext/tcltklib/tcltklib.c 2005-04-07 02:46:48.000000000 +0900
-@@ -247,6 +247,7 @@
- }
-
- /* call original 'exit' command */
-+#if 0
- static void
- call_original_exit(ptr, state)
- struct tcltkip *ptr;
-@@ -318,6 +319,7 @@
-
- rb_thread_critical = thr_crit_bup;
- }
-+#endif
-
- /* Tk_ThreadTimer */
- static Tcl_TimerToken timer_token = (Tcl_TimerToken)NULL;
-@@ -5147,6 +5153,7 @@
- return ip_invoke_with_position(argc, argv, obj, TCL_QUEUE_TAIL);
- }
-
-+#if 0
- static VALUE
- ip_invoke_immediate(argc, argv, obj)
- int argc;
-@@ -5155,6 +5162,7 @@
- {
- return ip_invoke_with_position(argc, argv, obj, TCL_QUEUE_HEAD);
- }
-+#endif
-
- /* access Tcl variables */
- static VALUE
-diff -ruN ruby-1.8.2.orig/ext/tk/tkutil.c ruby-1.8.2/ext/tk/tkutil.c
---- ruby-1.8.2.orig/ext/tk/tkutil.c 2004-12-23 13:16:43.000000000 +0900
-+++ ruby-1.8.2/ext/tk/tkutil.c 2005-04-07 02:45:13.000000000 +0900
-@@ -188,6 +188,7 @@
- return tk_toUTF8(1, argv, self);
- }
-
-+#if 0
- static VALUE
- fromUTF8_toDefaultEnc(str, self)
- VALUE str;
-@@ -198,6 +199,7 @@
- argv[0] = str;
- return tk_fromUTF8(1, argv, self);
- }
-+#endif
-
-
- static void
-@@ -835,12 +837,14 @@
- }
- }
-
-+#if 0
- static VALUE
- tkstr_to_dec(value)
- VALUE value;
- {
- return rb_cstr_to_inum(RSTRING(value)->ptr, 10, 1);
- }
-+#endif
-
- static VALUE
- tkstr_to_int(value)
diff -ruN ruby-1.8.2.orig/parse.y ruby-1.8.2/parse.y
--- ruby-1.8.2.orig/parse.y 2004-11-29 15:13:51.000000000 +0900
+++ ruby-1.8.2/parse.y 2005-04-07 02:42:52.000000000 +0900
Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-4/ruby.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ruby.spec 3 Oct 2005 06:39:36 -0000 1.35
+++ ruby.spec 4 Jan 2006 09:13:05 -0000 1.36
@@ -3,8 +3,8 @@
%define sitedir %{_libdir}/site_ruby
Name: ruby
-Version: 1.8.3
-Release: 2.fc4
+Version: 1.8.4
+Release: 1.fc4
License: Distributable
URL: http://www.ruby-lang.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -22,9 +22,8 @@
Source10: ruby-mode-init.el
Patch1: ruby-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
+Patch4: ruby-tcltk-multilib.patch
Summary: An interpreter of object-oriented scripting language
Group: Development/Languages
@@ -128,7 +127,6 @@
%ifarch ppc64 s390x sparc64 x86_64
%patch1 -p1
%endif
-%patch2 -p1
%patch3 -p1
%ifarch ppc64 s390x sparc64 x86_64
%patch4 -p1
@@ -374,7 +372,6 @@
%doc %{name}-%{version}/COPYING*
%doc %{name}-%{version}/ChangeLog
%doc %{name}-%{version}/LEGAL
-%doc tmp-ruby-docs/ruby-libs/*
%dir %{_libdir}/ruby
%dir %{_libdir}/ruby/%{rubyxver}
%dir %{_libdir}/ruby/%{rubyxver}/cgi
@@ -407,6 +404,7 @@
%files docs
%defattr(-, root, root)
%doc tmp-ruby-docs/ruby-docs/*
+%doc tmp-ruby-docs/ruby-libs/*
%files mode -f ruby-mode.files
%defattr(-, root, root)
@@ -414,6 +412,13 @@
%dir %{_datadir}/emacs/site-lisp/ruby-mode
%changelog
+* Wed Jan 4 2006 Akira TAGOH <tagoh at redhat.com> - 1.8.4-1.fc4
+- New upstream release (#176670)
+ - Kernel module ri documents are available. (#174923)
+- ruby-1.8.2-strscan-memset.patch: removed.
+- moved the documents from ruby-libs to ruby-docs, which contains the arch
+ specific thing and to be multilib support.
+
* Mon Oct 3 2005 Akira TAGOH <tagoh at redhat.com> - 1.8.3-2.fc4
- fixed the wrong file list. the external libraries for tcl/tk was included
in ruby-libs unexpectedly. (#169619)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ruby/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 26 Sep 2005 11:02:57 -0000 1.11
+++ sources 4 Jan 2006 09:13:05 -0000 1.12
@@ -2,4 +2,4 @@
d65e3a216d6d345a2a6f1aa8758c2f75 ruby-refm-rdp-1.8.1-ja-html.tar.gz
7f3e181c0be9a1579e43a5a8b26372d6 rubyfaq-990927.tar.bz2
8aa2e2da327dc43ff6e46e634eb657b6 rubyfaq-jp-990927.tar.bz2
-63d6c2bddd6af86664e338b31f3189a6 ruby-1.8.3.tar.gz
+bd8c2e593e1fa4b01fd98eaf016329bb ruby-1.8.4.tar.gz
--- ruby-1.8.2-strscan-memset.patch DELETED ---
--- ruby-1.8.2-tcltk-multilib.patch DELETED ---
More information about the fedora-cvs-commits
mailing list