Hello community,
here is the log from the commit of package ruby
checked in at Mon Aug 6 18:21:31 CEST 2007.
--------
--- ruby/ruby.changes 2007-03-30 10:10:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/ruby/ruby.changes 2007-08-06 03:19:55.506621000 +0200
@@ -1,0 +2,75 @@
+Mon Aug 6 03:11:29 CEST 2007 - mrueckert@suse.de
+
+- added ruby-1.8.6.p36_thread_prototype_and_testsuite.patch:
+ pulled two fixes from the 1.8.6 branch:
+ * avoid executing shell in the testsuite
+ * moved definition of rb_thread_status() to avoid errors in C++
+ extensions.
+
+-------------------------------------------------------------------
+Sun Aug 5 22:35:36 CEST 2007 - mrueckert@suse.de
+
+- update to 1.8.6.p36:
+ many bugfixes and library updates. hilights:
+ === Library updates (outstanding ones only)
+ * date
+ * Updated based on date2 4.0.3.
+ * digest
+ * New internal APIs for C and Ruby.
+ * Support for autoloading.
+ * See below for new features and compatibility issues.
+ * nkf
+ * Updated based on nkf as of 2007-01-28.
+ * tk
+ * Tk::X_Scrollable (Y_Scrollable) is renamed to Tk::XScrollable
+ (YScrollable). Tk::X_Scrollable (Y_Scrollable) is still
+ available, but it is an alias name.
+ * Updated Tile extension support based on Tile 0.7.8.
+ * Support --without-X11 configure option for non-X11 versions
+ of Tcl/Tk (e.g. Tcl/Tk Aqua).
+ * New sample script: irbtkw.rbw -- IRB on Ruby/Tk. It has no
+ trouble about STDIN blocking on Windows.
+ === New methods and features
+ * builtin classes
+ * New method: Kernel#instance_variable_defined?
+ * New method: Module#class_variable_defined?
+ * New feature: Dir::glob() can now take an array of glob
+ patterns.
+ * digest
+ * New digest class methods: file
+ * New digest instance methods: clone, reset, new,
+ inspect, digest_length (alias size or length),
+ block_length()
+ * New library: digest/bubblebabble
+ * New function: Digest(name)
+ * fileutils
+ * New option for FileUtils.cp_r(): :remove_destination
+ * thread
+ * Replaced with much faster mutex implementation in C. The
+ former implementation is available with a configure option
+ `--disable-fastthread'.
+ * webrick
+ * New method: WEBrick::Cookie.parse_set_cookies()
+ === Compatibility issues (excluding feature bug fixes)
+ * builtin classes
+ * String#intern now raises SecurityError when $SAFE level is
+ greater than zero.
+ * fileutils
+ * A minor implementation change breaks Rake <=0.7.1.
+ Updating Rake to 0.7.2 fixes the problem.
+ * digest
+ * The constructor does no longer take an initial string to
+ feed; digest() and hexdigest() now do, instead.
+ For all details see the NEWS or ChangeLog file.
+- rediffed patch ruby-1.8.2-gc.diff
+ new name ruby-1.8.6.p36_gc.patch
+- rediffed patch ruby-1.8.2-tcltk-multilib.patch
+ new name ruby-1.8.6.p36_tcltk-multilib.patch
+- rediffed patch ruby-socket_ipv6.patch
+ new name ruby-1.8.6.p36_socket_ipv6.patch
+- rediffed patch ruby-1.8.5-vendor_ruby.patch
+ new name ruby-1.8.6.p36_vendor_ruby.patch
+- rediffed patch ruby-1.8.5.p12-lib64.diff
+ new name ruby-1.8.6.p36_lib64.patch
+
+-------------------------------------------------------------------
Old:
----
ruby-1.8.2-gc.diff
ruby-1.8.2-tcltk-multilib.patch
ruby-1.8.5_linkerflags.patch
ruby-1.8.5.p12-lib64.diff
ruby-1.8.5-p12.tar.bz2
ruby-1.8.5-vendor_ruby.patch
ruby-1.8.x-autoconf_2.61a.patch
ruby-socket_ipv6.patch
New:
----
ruby-1.8.6.p36_gc.patch
ruby-1.8.6.p36_lib64.patch
ruby-1.8.6.p36_socket_ipv6.patch
ruby-1.8.6-p36.tar.bz2
ruby-1.8.6.p36_tcltk-multilib.patch
ruby-1.8.6.p36_thread_prototype_and_testsuite.patch
ruby-1.8.6.p36_vendor_ruby.patch
ruby-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ruby.spec ++++++
--- /var/tmp/diff_new_pack.o16726/_old 2007-08-06 18:19:45.000000000 +0200
+++ /var/tmp/diff_new_pack.o16726/_new 2007-08-06 18:19:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ruby (Version 1.8.5.pl12)
+# spec file for package ruby (Version 1.8.6.p36)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,17 +11,23 @@
# norootforbuild
Name: ruby
-Version: 1.8.5.pl12
-Release: 6
-%define pkg_version 1.8.5
-%define patch_level p12
+Version: 1.8.6.p36
+Release: 1
+%define pkg_version 1.8.6
+%define patch_level p36
%define rb_ver %(echo %{pkg_version} | sed -e 's/\\\.[0-9]\\\+$//')
#
-License: GNU General Public License (GPL)
+License: GPL v2 or later, http://www.ruby-lang.org/en/LICENSE.txt
Group: Development/Languages/Ruby
#
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison gdbm-devel gperf graphviz libjpeg-devel openssl-devel readline-devel tk-devel
+%if 0%{suse_version} >= 1030
+%define use_fdupes 1
+%endif
+%if 0%{?use_fdupes}
+BuildRequires: fdupes
+%endif
%if 0%{?suse_version} < 930
BuildRequires: XFree86-devel XFree86-fonts-scalable
%else
@@ -30,21 +36,22 @@
Provides: /usr/bin/ruby
#
URL: http://www.ruby-lang.org/
-Source0: ruby-%{pkg_version}-%{patch_level}.tar.bz2
+Source: ftp://ftp.ruby-lang.org/pub/ruby/ruby-%{pkg_version}-%{patch_level}.tar.bz2
Source1: irb.1
Source2: ruby-doc-bundle.tar.bz2
-Patch0: ruby-1.8.2-gc.diff
-Patch1: ruby-1.8.5.p12-lib64.diff
-Patch2: ruby-1.8.2-tcltk-multilib.patch
-Patch3: ruby-socket_ipv6.patch
-Patch4: ruby-1.8.5_linkerflags.patch
+Patch0: ruby-1.8.6.p36_gc.patch
+Patch1: ruby-1.8.6.p36_lib64.patch
+Patch2: ruby-1.8.6.p36_tcltk-multilib.patch
+Patch3: ruby-1.8.6.p36_socket_ipv6.patch
+Patch4: ruby-1.8.6.p36_thread_prototype_and_testsuite.patch
# vendor ruby files taken from:
# http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/
-Patch5: ruby-1.8.5-vendor_ruby.patch
-Patch6: ruby-1.8.x-autoconf_2.61a.patch
+Patch5: ruby-1.8.6.p36_vendor_ruby.patch
Source3: site-specific.rb
Source4: vendor-specific.rb
#
+Source5: ruby-rpmlintrc
+#
Summary: An Interpreted Object-Oriented Scripting Language
%description
@@ -84,7 +91,7 @@
%package devel
Group: Development/Languages/Ruby
-Summary: Development files to link against Ruby.
+Summary: Development files to link against Ruby
Requires: %{name} = %{version}
%description devel
@@ -198,7 +205,6 @@
%patch3
%patch4
%patch5
-%patch6
find . -type f | xargs -n 1 sed -i "s@#!\s*/usr/local/bin/ruby@#!/usr/bin/ruby@"
touch parse.y
@@ -213,6 +219,20 @@
%{__make} all
%{__make} -C ext/tk/ all
#
+# TODO: patch the .document files to include all needed modules.
+#
+export LD_LIBRARY_PATH="$PWD/"
+export RUBYLIB="$PWD:$PWD/lib:$(find $PWD/.ext $PWD/ext/ -type d |tr '\n' ':')."
+./ruby bin/rdoc \
+ --all --line-numbers --ri-system \
+ --op=ri/%{rb_ver}/system .
+./ruby bin/rdoc \
+ --all --line-numbers --charset=UTF-8 \
+ --fmt=html -p --inline-source \
+ --op=rdoc/html .
+
+%check
+#
# move the tests out of the way that require an installed ruby
# we dont have that in our build environment.
#
@@ -231,7 +251,7 @@
#
# run the test suites
#
-#%{__make} check
+%{__make} check ||:
#
# TODO:
# the big test suite fails with some weird openssl errors on ppc
@@ -245,16 +265,6 @@
%ifarch ppc64 s390x
%{__mv} unused.test/openssl/ test/
%endif
-#
-# TODO: patch the .document files to include all needed modules.
-#
-./ruby bin/rdoc \
- --all --line-numbers --ri-system \
- --op=ri/%{rb_ver}/system .
-./ruby bin/rdoc \
- --all --line-numbers --charset=UTF-8 \
- --fmt=html -p --inline-source \
- --op=rdoc/html .
%install
%makeinstall
@@ -272,12 +282,12 @@
%{__install} -m 0644 %{S:4} %{buildroot}%{_libdir}/%{name}/vendor_%{name}/%{rb_ver}
#
%{__cp} -rv \
- ri/%{rb_ver}/system/* %{buildroot}%{_datadir}/
-mv %{buildroot}%{_datadir}{,/ri/%{rb_ver}}/created.rid
+ ri/ %{buildroot}%{_datadir}/
+#mv %{buildroot}%{_datadir}{,/ri/%{rb_ver}}/created.rid
%{__cp} -rv \
COPYING COPYING.ja ChangeLog GPL LEGAL \
LGPL README README.EXT README.EXT.ja \
- README.ja ToDo doc/NEWS \
+ README.ja ToDo NEWS \
%{buildroot}%{_docdir}/%{name}
%{__cp} -rv \
ruby-doc-bundle %{buildroot}%{_docdir}/%{name}
@@ -285,8 +295,13 @@
rdoc/html %{buildroot}%{_docdir}/%{name}/ruby-library-docs
%{__cp} -rv \
sample %{buildroot}%{_docdir}/%{name}/examples
+sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb
%{__cp} -r test/ runruby.rb %{buildroot}%{_docdir}/%{name}-test-suite/
%{__ln_s} -f %{_bindir}/%{name} %{buildroot}%{_docdir}/%{name}-test-suite/%{name}
+%if 0%{?use_fdupes}
+
+%fdupes %{buildroot}
+%endif
%post -p /sbin/ldconfig
@@ -297,9 +312,9 @@
%{_bindir}/*
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/%{rb_ver}
+%{_libdir}/lib%{name}.so.%{rb_ver}*
%dir %{_datadir}/emacs
%dir %{_datadir}/emacs/site-lisp
-%{_libdir}/lib%{name}.so.%{rb_ver}*
%{_datadir}/emacs/site-lisp/*
%{_mandir}/man1/*
%dir %{_libdir}/%{name}/site_%{name}
@@ -325,6 +340,9 @@
%{_libdir}/%{name}/%{rb_ver}/debug.rb
%{_libdir}/%{name}/%{rb_ver}/delegate.rb
%{_libdir}/%{name}/%{rb_ver}/bigdecimal/
+%{_libdir}/%{name}/%{rb_ver}/digest.rb
+%dir %{_libdir}/%{name}/%{rb_ver}/digest/
+%{_libdir}/%{name}/%{rb_ver}/digest/sha2.rb
%{_libdir}/%{name}/%{rb_ver}/dl/
%{_libdir}/%{name}/%{rb_ver}/drb*
%{_libdir}/%{name}/%{rb_ver}/e2mmap.rb
@@ -410,6 +428,7 @@
%{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/rbconfig.rb
%{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/[a-sA-s]*.so
%{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/[u-zU-Z]*.so
+%{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/thread.so
%{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/digest/
%{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/io/
%{_libdir}/%{name}/%{rb_ver}/%{rb_arch}/racc/
@@ -455,6 +474,75 @@
%doc %{_docdir}/%{name}/examples
%changelog
+* Mon Aug 06 2007 - mrueckert@suse.de
+- added ruby-1.8.6.p36_thread_prototype_and_testsuite.patch:
+ pulled two fixes from the 1.8.6 branch:
+ * avoid executing shell in the testsuite
+ * moved definition of rb_thread_status() to avoid errors in C++
+ extensions.
+* Sun Aug 05 2007 - mrueckert@suse.de
+- update to 1.8.6.p36:
+ many bugfixes and library updates. hilights:
+ === Library updates (outstanding ones only)
+ * date
+ * Updated based on date2 4.0.3.
+ * digest
+ * New internal APIs for C and Ruby.
+ * Support for autoloading.
+ * See below for new features and compatibility issues.
+ * nkf
+ * Updated based on nkf as of 2007-01-28.
+ * tk
+ * Tk::X_Scrollable (Y_Scrollable) is renamed to Tk::XScrollable
+ (YScrollable). Tk::X_Scrollable (Y_Scrollable) is still
+ available, but it is an alias name.
+ * Updated Tile extension support based on Tile 0.7.8.
+ * Support --without-X11 configure option for non-X11 versions
+ of Tcl/Tk (e.g. Tcl/Tk Aqua).
+ * New sample script: irbtkw.rbw -- IRB on Ruby/Tk. It has no
+ trouble about STDIN blocking on Windows.
+ === New methods and features
+ * builtin classes
+ * New method: Kernel#instance_variable_defined?
+ * New method: Module#class_variable_defined?
+ * New feature: Dir::glob() can now take an array of glob
+ patterns.
+ * digest
+ * New digest class methods: file
+ * New digest instance methods: clone, reset, new,
+ inspect, digest_length (alias size or length),
+ block_length()
+ * New library: digest/bubblebabble
+ * New function: Digest(name)
+ * fileutils
+ * New option for FileUtils.cp_r(): :remove_destination
+ * thread
+ * Replaced with much faster mutex implementation in C. The
+ former implementation is available with a configure option
+ `--disable-fastthread'.
+ * webrick
+ * New method: WEBrick::Cookie.parse_set_cookies()
+ === Compatibility issues (excluding feature bug fixes)
+ * builtin classes
+ * String#intern now raises SecurityError when $SAFE level is
+ greater than zero.
+ * fileutils
+ * A minor implementation change breaks Rake <=0.7.1.
+ Updating Rake to 0.7.2 fixes the problem.
+ * digest
+ * The constructor does no longer take an initial string to
+ feed; digest() and hexdigest() now do, instead.
+ For all details see the NEWS or ChangeLog file.
+- rediffed patch ruby-1.8.2-gc.diff
+ new name ruby-1.8.6.p36_gc.patch
+- rediffed patch ruby-1.8.2-tcltk-multilib.patch
+ new name ruby-1.8.6.p36_tcltk-multilib.patch
+- rediffed patch ruby-socket_ipv6.patch
+ new name ruby-1.8.6.p36_socket_ipv6.patch
+- rediffed patch ruby-1.8.5-vendor_ruby.patch
+ new name ruby-1.8.6.p36_vendor_ruby.patch
+- rediffed patch ruby-1.8.5.p12-lib64.diff
+ new name ruby-1.8.6.p36_lib64.patch
* Fri Mar 30 2007 - rguenther@suse.de
- add bison BuildRequires
- add emacs site-lisp directories
++++++ ruby-1.8.6.p36_gc.patch ++++++
Index: gc.c
===================================================================
--- gc.c.orig
+++ gc.c
@@ -425,7 +425,7 @@ unsigned int _stacksize = 262144;
# define STACK_LEVEL_MAX (_stacksize - 4096)
# undef HAVE_GETRLIMIT
#elif defined(HAVE_GETRLIMIT) || defined(_WIN32)
-static unsigned int STACK_LEVEL_MAX = 655300;
+static unsigned long STACK_LEVEL_MAX = 655300;
#else
# define STACK_LEVEL_MAX 655300
#endif
@@ -485,7 +485,7 @@ stack_grow_direction(addr)
(ret) = (STACK_LENGTH > STACK_LEVEL_MAX + GC_WATER_MARK);\
} while (0)
-int
+long
ruby_stack_length(p)
VALUE **p;
{
Index: intern.h
===================================================================
--- intern.h.orig
+++ intern.h
@@ -238,7 +238,7 @@ VALUE rb_file_directory_p _((VALUE,VALUE
/* gc.c */
NORETURN(void rb_memerror __((void)));
int ruby_stack_check _((void));
-int ruby_stack_length _((VALUE**));
+long ruby_stack_length _((VALUE**));
char *rb_source_filename _((const char*));
void rb_gc_mark_locations _((VALUE*, VALUE*));
void rb_mark_tbl _((struct st_table*));
++++++ ruby-1.8.6.p36_lib64.patch ++++++
Index: configure.in
===================================================================
--- configure.in.orig
+++ configure.in
@@ -1235,7 +1235,7 @@ rb_cv_missing_fconvert=yes, rb_cv_missin
if test "$rb_cv_missing_fconvert" = yes; then
AC_DEFINE(MISSING_FCONVERT)
fi
- AC_LIBOBJ([x68.o])
+ AC_LIBOBJ([x68])
CFLAGS="$CFLAGS -fansi-only"
XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
EXEEXT=.x
@@ -1548,7 +1548,7 @@ case "$target_os" in
RUBY_LIB_PREFIX="/lib/ruby"
;;
*)
- RUBY_LIB_PREFIX="${prefix}/lib/ruby"
+ RUBY_LIB_PREFIX="${libdir}/ruby"
;;
esac
RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
@@ -1556,7 +1556,7 @@ RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJO
AC_ARG_WITH(sitedir,
[ --with-sitedir=DIR site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
[sitedir=$withval],
- [sitedir='${prefix}/lib/ruby/site_ruby'])
+ [sitedir='${libdir}/ruby/site_ruby'])
SITE_DIR=`eval echo \\"${sitedir}\\"`
case "$target_os" in
cygwin*|mingw*|*djgpp*|os2-emx*)
++++++ ruby-1.8.6.p36_socket_ipv6.patch ++++++
Index: ext/socket/extconf.rb
===================================================================
--- ext/socket/extconf.rb.orig
+++ ext/socket/extconf.rb
@@ -43,6 +43,7 @@ if enable_config("ipv6", default_ipv6)
if checking_for("ipv6") {try_link(<