rpms/ruby/devel ruby-multilib.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 ruby-1.8.2-deadcode.patch, 1.1, 1.2 ruby.spec, 1.34, 1.35 sources, 1.10, 1.11 ruby-1.8.0-multilib.patch, 1.1, NONE ruby-1.8.2-xmlrpc-CAN-2005-1992.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Sep 21 07:29:48 UTC 2005
Author: tagoh
Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv770
Modified Files:
.cvsignore ruby-1.8.2-deadcode.patch ruby.spec sources
Added Files:
ruby-multilib.patch
Removed Files:
ruby-1.8.0-multilib.patch
ruby-1.8.2-xmlrpc-CAN-2005-1992.patch
Log Message:
* Wed Sep 21 2005 Akira TAGOH <tagoh at redhat.com> - 1.8.3-1
- New upstream release.
- Build-Requires xorg-x11-devel instead of XFree86-devel.
- ruby-multilib.patch: applied for only 64-bit archs.
- ruby-1.8.2-xmlrpc-CAN-2005-1992.patch: removed. it has already been in upstream.
ruby-multilib.patch:
mkconfig.rb | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE ruby-multilib.patch ---
diff -ruN ruby-1.8.3.orig/mkconfig.rb ruby-1.8.3/mkconfig.rb
--- ruby-1.8.3.orig/mkconfig.rb 2005-09-21 15:10:57.000000000 +0900
+++ ruby-1.8.3/mkconfig.rb 2005-09-21 15:17:32.000000000 +0900
@@ -74,7 +74,7 @@
drive = File::PATH_SEPARATOR == ';'
-prefix = '/lib/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM
+prefix = '/lib64/ruby/' + RUBY_VERSION.sub(/\.\d+$/, '') + '/' + RUBY_PLATFORM
print " TOPDIR = File.dirname(__FILE__).chomp!(#{prefix.dump})\n"
print " DESTDIR = ", (drive ? "TOPDIR && TOPDIR[/\\A[a-z]:/i] || " : ""), "'' unless defined? DESTDIR\n"
print " CONFIG = {}\n"
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 5 Jan 2005 07:28:29 -0000 1.11
+++ .cvsignore 21 Sep 2005 07:29:44 -0000 1.12
@@ -5,3 +5,4 @@
rubyfaq-jp-990927.tar.bz2
*.rpm
ruby-1.8.2.tar.gz
+ruby-1.8.3.tar.gz
ruby-1.8.2-deadcode.patch:
ext/bigdecimal/bigdecimal.c | 2 ++
ext/pty/pty.c | 2 ++
ext/tcltklib/tcltklib.c | 4 ++++
ext/tk/tkutil.c | 4 ++++
parse.y | 4 ++++
regex.c | 4 ++++
6 files changed, 20 insertions(+)
Index: ruby-1.8.2-deadcode.patch
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby-1.8.2-deadcode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ruby-1.8.2-deadcode.patch 6 Apr 2005 18:09:19 -0000 1.1
+++ ruby-1.8.2-deadcode.patch 21 Sep 2005 07:29:44 -0000 1.2
@@ -53,38 +53,6 @@
/* Tk_ThreadTimer */
static Tcl_TimerToken timer_token = (Tcl_TimerToken)NULL;
-@@ -1128,6 +1130,7 @@
- }
-
- /* Tcl command `ruby'|`ruby_eval' */
-+#if 0
- static VALUE
- ip_ruby_eval_rescue(failed, einfo)
- VALUE failed;
-@@ -1137,6 +1140,7 @@
- RARRAY(failed)->ptr[0] = einfo;
- return Qnil;
- }
-+#endif
-
- struct eval_body_arg {
- char *string;
-@@ -1484,6 +1488,7 @@
- return ret;
- }
-
-+#if 0
- static VALUE
- ip_ruby_cmd_rescue(failed, einfo)
- VALUE failed;
-@@ -1493,6 +1498,7 @@
- RARRAY(failed)->ptr[0] = einfo;
- return Qnil;
- }
-+#endif
-
- static VALUE
- ip_ruby_cmd_body(arg)
@@ -5147,6 +5153,7 @@
return ip_invoke_with_position(argc, argv, obj, TCL_QUEUE_TAIL);
}
Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ruby.spec 21 Jun 2005 08:38:24 -0000 1.34
+++ ruby.spec 21 Sep 2005 07:29:44 -0000 1.35
@@ -3,12 +3,12 @@
%define sitedir %{_libdir}/site_ruby
Name: ruby
-Version: 1.8.2
-Release: 9
+Version: 1.8.3
+Release: 1
License: Distributable
URL: http://www.ruby-lang.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl tk XFree86-devel autoconf gcc unzip openssl-devel db4-devel emacs
+BuildRequires: readline readline-devel ncurses ncurses-devel gdbm gdbm-devel glibc-devel tcl tk xorg-x11-devel autoconf gcc unzip openssl-devel db4-devel emacs
Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{name}-%{version}.tar.gz
##Source1: ftp://ftp.ruby-lang.org/pub/%{name}/doc/%{name}-man-%{manver}.tar.gz
@@ -21,11 +21,10 @@
Source5: irb.1
Source10: ruby-mode-init.el
-Patch1: ruby-1.8.0-multilib.patch
+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
-Patch5: ruby-1.8.2-xmlrpc-CAN-2005-1992.patch
Summary: An interpreter of object-oriented scripting language
Group: Development/Languages
@@ -126,13 +125,14 @@
tar fxz %{SOURCE2}
popd
pushd %{name}-%{version}
+%ifarch ppc64 s390x sparc64 x86_64
%patch1 -p1
+%endif
%patch2 -p1
%patch3 -p1
-%ifarch sparc64 ppc64 s390x x86_64
+%ifarch ppc64 s390x sparc64 x86_64
%patch4 -p1
%endif
-%patch5 -p1
popd
%build
@@ -262,7 +262,7 @@
cd ..
# generate ri doc
-DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/ext/syck -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}
+DESTDIR=$RPM_BUILD_ROOT LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_bindir}/ruby -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version} -I $RPM_BUILD_ROOT%{_libdir}/ruby/%{rubyxver}/%{_target_cpu}-%{_target_os}/ -I $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}/lib $RPM_BUILD_ROOT%{_bindir}/rdoc --all --ri-system $RPM_BUILD_DIR/%{name}-%{version}/%{name}-%{version}
# XXX: installing irb
chmod 555 $RPM_BUILD_ROOT%{_bindir}/irb
@@ -413,6 +413,12 @@
%dir %{_datadir}/emacs/site-lisp/ruby-mode
%changelog
+* Wed Sep 21 2005 Akira TAGOH <tagoh at redhat.com> - 1.8.3-1
+- New upstream release.
+- Build-Requires xorg-x11-devel instead of XFree86-devel.
+- ruby-multilib.patch: applied for only 64-bit archs.
+- ruby-1.8.2-xmlrpc-CAN-2005-1992.patch: removed. it has already been in upstream.
+
* Tue Jun 21 2005 Akira TAGOH <tagoh at redhat.com> - 1.8.2-9
- ruby-1.8.2-xmlrpc-CAN-2005-1992.patch: fixed the arbitrary command execution
on XMLRPC server. (#161096)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 5 Jan 2005 07:28:29 -0000 1.10
+++ sources 21 Sep 2005 07:29:44 -0000 1.11
@@ -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
-8ffc79d96f336b80f2690a17601dea9b ruby-1.8.2.tar.gz
+63d6c2bddd6af86664e338b31f3189a6 ruby-1.8.3.tar.gz
--- ruby-1.8.0-multilib.patch DELETED ---
--- ruby-1.8.2-xmlrpc-CAN-2005-1992.patch DELETED ---
More information about the fedora-cvs-commits
mailing list