From cf46bd78a14c37b25dcf7a246ad6b987864d1ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 27 Aug 2014 17:26:16 +0200 Subject: [PATCH 01/27] Upgrade to Ruby 2.2.0 (r47288). --- ruby-1.9.3-mkmf-verbose.patch | 2 +- ruby-1.9.3.p195-fix-webrick-tests.patch | 25 -------- ...-additional-preludes-by-configuratio.patch | 17 +++--- ...0-Enable-configuration-of-archlibdir.patch | 2 +- ...ed-paths-when-empty-version-string-i.patch | 8 +-- ruby-2.1.0-always-use-i386.patch | 4 +- ruby-2.1.0-custom-rubygems-location.patch | 22 +++---- ruby-r46485-libffi31.patch | 14 ----- ruby.spec | 60 ++++++------------- 9 files changed, 46 insertions(+), 108 deletions(-) delete mode 100644 ruby-1.9.3.p195-fix-webrick-tests.patch delete mode 100644 ruby-r46485-libffi31.patch diff --git a/ruby-1.9.3-mkmf-verbose.patch b/ruby-1.9.3-mkmf-verbose.patch index 66107c4..eb33679 100644 --- a/ruby-1.9.3-mkmf-verbose.patch +++ b/ruby-1.9.3-mkmf-verbose.patch @@ -11,7 +11,7 @@ diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 682eb46..e6b1445 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb -@@ -1828,7 +1828,7 @@ SRC +@@ -1842,7 +1842,7 @@ SRC SHELL = /bin/sh # V=0 quiet, V=1 verbose. other values don't work. diff --git a/ruby-1.9.3.p195-fix-webrick-tests.patch b/ruby-1.9.3.p195-fix-webrick-tests.patch deleted file mode 100644 index 3b2d6e7..0000000 --- a/ruby-1.9.3.p195-fix-webrick-tests.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2db9ad4a090d0c82e30afa44c623e3c5c99f7a37 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADt=20Ondruch?= -Date: Mon, 19 Nov 2012 14:37:28 +0100 -Subject: [PATCH] Fix WEBrick tests. - ---- - test/runner.rb | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/test/runner.rb b/test/runner.rb -index 94beb44..db4dfe9 100644 ---- a/test/runner.rb -+++ b/test/runner.rb -@@ -2,6 +2,8 @@ require 'rbconfig' - - require 'test/unit' - -+require_relative 'ruby/envutil' -+ - src_testdir = File.dirname(File.realpath(__FILE__)) - $LOAD_PATH << src_testdir - module Gem --- -1.8.3.1 - diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index e297a73..4df3eeb 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -4,31 +4,32 @@ Date: Fri, 4 Oct 2013 22:13:11 +0200 Subject: [PATCH] Allow to specify addition preludes by configuration option. --- - Makefile.in | 1 + + Makefile.in | 2 ++ common.mk | 2 +- configure.in | 7 +++++++ - 3 files changed, 9 insertions(+), 1 deletion(-) + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 7e8ed82..7916993 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -114,6 +114,7 @@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ +@@ -113,6 +113,8 @@ XRUBY_LIBDIR = @XRUBY_LIBDIR@ + XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ - DEFAULT_PRELUDES = $(GEM_PRELUDE) +OPTIONAL_PRELUDES = @OPTIONAL_PRELUDES@ - ++ #### End of system configuration section. #### + MAJOR= @MAJOR@ diff --git a/common.mk b/common.mk index 5cfbc3d..3f0a82e 100644 --- a/common.mk +++ b/common.mk -@@ -109,7 +109,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) - +@@ -111,7 +111,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) + DEFAULT_PRELUDES = $(GEM_PRELUDE) -PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES) +PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES) $(OPTIONAL_PRELUDES) GEM_PRELUDE = $(srcdir)/gem_prelude.rb @@ -38,7 +39,7 @@ diff --git a/configure.in b/configure.in index 0e371e2..d4f1dcb 100644 --- a/configure.in +++ b/configure.in -@@ -3841,6 +3841,13 @@ AC_SUBST(rubyarchhdrdir)dnl +@@ -4078,6 +4078,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 90a97d7..c20b24e 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 37d9a62..553d4d0 100644 --- a/configure.in +++ b/configure.in -@@ -3071,6 +3071,11 @@ if test ${multiarch+set}; then +@@ -3301,6 +3301,11 @@ if test ${multiarch+set}; then fi archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index 37c6fa4..ea19698 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in index 17ed3ed..5843651 100644 --- a/configure.in +++ b/configure.in -@@ -3645,8 +3645,6 @@ AS_CASE(["$target_os"], +@@ -3885,8 +3885,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -23,7 +23,7 @@ index 17ed3ed..5843651 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, -@@ -3676,6 +3674,7 @@ AC_ARG_WITH(ruby-version, +@@ -3916,6 +3914,7 @@ AC_ARG_WITH(ruby-version, [ruby_version=full]) unset RUBY_LIB_VERSION unset RUBY_LIB_VERSION_STYLE @@ -31,7 +31,7 @@ index 17ed3ed..5843651 100644 AS_CASE(["$ruby_version"], [full], [RUBY_LIB_VERSION_STYLE='3 /* full */'], [minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */']) -@@ -3692,30 +3691,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then +@@ -3932,30 +3931,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`" eval $ruby_version elif test -z "${ruby_version}"; then @@ -113,7 +113,7 @@ diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 07076d4..35e6c3c 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb -@@ -121,7 +121,7 @@ File.foreach "config.status" do |line| +@@ -123,7 +123,7 @@ File.foreach "config.status" do |line| val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump case name when /^prefix$/ diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index 88eff60..3a83179 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 553d4d0..03a4152 100644 --- a/configure.in +++ b/configure.in -@@ -3757,6 +3757,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -3997,6 +3997,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl @@ -19,7 +19,7 @@ index 553d4d0..03a4152 100644 + if test "${universal_binary-no}" = yes ; then arch="universal-${target_os}" - AC_CACHE_CHECK(whether __ARCHITECTURE__ is available, rb_cv_architecture_available, + if test "${rb_cv_architecture_available}" = yes; then -- 1.8.3.1 diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index e0e488b..b807a8c 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -5,17 +5,17 @@ Subject: [PATCH] Allow to install RubyGems into custom location, outside of Ruby tree. --- - configure.in | 5 +++++ - loadpath.c | 4 ++++ - template/verconf.h.in | 3 +++ - tool/rbinstall.rb | 9 +++++++++ + configure.in | 5 +++++ + loadpath.c | 4 ++++ + template/verconf.h.tmpl | 3 +++ + tool/rbinstall.rb | 9 +++++++++ 4 files changed, 21 insertions(+) diff --git a/configure.in b/configure.in index 03a4152..0e371e2 100644 --- a/configure.in +++ b/configure.in -@@ -3731,6 +3731,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -3971,6 +3971,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644 if test "${LOAD_RELATIVE+set}"; then AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -3754,6 +3754,7 @@ AC_SUBST(sitearchdir)dnl +@@ -3994,6 +3998,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl @@ -49,10 +49,10 @@ index 623dc9d..74c5d9e 100644 RUBY_LIB "\0" #ifdef RUBY_THINARCH RUBY_ARCH_LIB_FOR(RUBY_THINARCH) "\0" -diff --git a/template/verconf.h.in b/template/verconf.h.in +diff --git a/template/verconf.h.tmpl b/template/verconf.h.tmpl index 79c003e..34f2382 100644 ---- a/template/verconf.h.in -+++ b/template/verconf.h.in +--- a/template/verconf.h.tmpl ++++ b/template/verconf.h.tmpl @@ -34,6 +34,9 @@ % if C["RUBY_SEARCH_PATH"] #define RUBY_SEARCH_PATH "${RUBY_SEARCH_PATH}" @@ -67,7 +67,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index b47b6e1..0b99408 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb -@@ -324,6 +324,7 @@ sitelibdir = CONFIG["sitelibdir"] +@@ -317,6 +317,7 @@ sitelibdir = CONFIG["sitelibdir"] sitearchlibdir = CONFIG["sitearchdir"] vendorlibdir = CONFIG["vendorlibdir"] vendorarchlibdir = CONFIG["vendorarchdir"] @@ -75,7 +75,7 @@ index b47b6e1..0b99408 100755 mandir = CONFIG["mandir", true] docdir = CONFIG["docdir", true] configure_args = Shellwords.shellwords(CONFIG["configure_args"]) -@@ -512,7 +513,15 @@ end +@@ -505,7 +506,15 @@ end install?(:local, :comm, :lib) do prepare "library scripts", rubylibdir noinst = %w[README* *.txt *.rdoc *.gemspec] diff --git a/ruby-r46485-libffi31.patch b/ruby-r46485-libffi31.patch deleted file mode 100644 index 79144a6..0000000 --- a/ruby-r46485-libffi31.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: ext/fiddle/extconf.rb -=================================================================== ---- ext/fiddle/extconf.rb (revision 46484) -+++ ext/fiddle/extconf.rb (revision 46485) -@@ -7,7 +7,8 @@ - pkg_config("libffi") - if ver = pkg_config("libffi", "modversion") - ver = ver.gsub(/-rc\d+/, '') # If ver contains rc version, just ignored. -- $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver.split('.') }}) -+ ver = (ver.split('.') + [0,0])[0,3] -+ $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver }}) - end - - unless have_header('ffi.h') diff --git a/ruby.spec b/ruby.spec index 40b9a6c..fe406a2 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global major_version 2 -%global minor_version 1 -%global teeny_version 2 +%global minor_version 2 +%global teeny_version 0 %global major_minor_version %{major_version}.%{minor_version} %global ruby_version %{major_minor_version}.%{teeny_version} @@ -10,7 +10,7 @@ #%%global milestone preview2 # Keep the revision enabled for pre-releases from SVN. -#%%global revision 44362 +%global revision 47288 %global ruby_archive %{name}-%{ruby_version} @@ -34,12 +34,12 @@ # http://redmine.ruby-lang.org/issues/5313 %global irb_version %{ruby_version} -%global bigdecimal_version 1.2.4 +%global bigdecimal_version 1.2.5 %global io_console_version 0.4.2 %global json_version 1.8.1 -%global minitest_version 4.7.5 +%global minitest_version 5.4.0 %global psych_version 2.0.5 -%global rake_version 10.1.0 +%global rake_version 10.3.2 %global rdoc_version 4.1.0 # Might not be needed in the future, if we are lucky enough. @@ -94,11 +94,8 @@ Patch1: ruby-2.1.0-Enable-configuration-of-archlibdir.patch # Force multiarch directories for i.86 to be always named i386. This solves # some differencies in build between Fedora and RHEL. Patch2: ruby-2.1.0-always-use-i386.patch -# Fixes random WEBRick test failures. -# https://bugs.ruby-lang.org/issues/6573. -Patch3: ruby-1.9.3.p195-fix-webrick-tests.patch # Allows to install RubyGems into custom directory, outside of Ruby's tree. -# http://redmine.ruby-lang.org/issues/5617 +# http://bugs.ruby-lang.org/issues/5617 Patch4: ruby-2.1.0-custom-rubygems-location.patch # Make mkmf verbose by default Patch5: ruby-1.9.3-mkmf-verbose.patch @@ -106,9 +103,6 @@ Patch5: ruby-1.9.3-mkmf-verbose.patch # in support for ABRT. # http://bugs.ruby-lang.org/issues/8566 Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch -# Fix build with libffi 3.1 -# https://bugs.ruby-lang.org/issues/9897 -Patch7: ruby-r46485-libffi31.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: ruby(rubygems) >= %{rubygems_version} @@ -346,9 +340,6 @@ libyaml[http://pyyaml.org/wiki/LibYAML] for its YAML parsing and emitting capabilities. In addition to wrapping libyaml, Psych also knows how to serialize and de-serialize most Ruby objects to and from the YAML format. -# TODO: -# %%pacakge -n rubygem-test-unit - %package tcltk Summary: Tcl/Tk interface for scripting language Ruby @@ -365,11 +356,9 @@ Tcl/Tk interface for the object-oriented scripting language Ruby. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p0 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -492,10 +481,6 @@ mv %{buildroot}%{ruby_libdir}/json* %{buildroot}%{gem_dir}/gems/json-%{json_vers mv %{buildroot}%{ruby_libarchdir}/json/ %{buildroot}%{_libdir}/gems/%{name}/json-%{json_version}/ mv %{buildroot}%{gem_dir}/specifications/default/json-%{json_version}.gemspec %{buildroot}%{gem_dir}/specifications -mkdir -p %{buildroot}%{gem_dir}/gems/minitest-%{minitest_version}/lib -mv %{buildroot}%{ruby_libdir}/minitest %{buildroot}%{gem_dir}/gems/minitest-%{minitest_version}/lib -mv %{buildroot}%{gem_dir}/specifications/default/minitest-%{minitest_version}.gemspec %{buildroot}%{gem_dir}/specifications - mkdir -p %{buildroot}%{gem_dir}/gems/psych-%{psych_version}/lib mkdir -p %{buildroot}%{_libdir}/gems/%{name}/psych-%{psych_version} mv %{buildroot}%{ruby_libdir}/psych* %{buildroot}%{gem_dir}/gems/psych-%{psych_version}/lib @@ -577,13 +562,13 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %postun libs -p /sbin/ldconfig %files +%doc BSDL %doc COPYING %lang(ja) %doc COPYING.ja %doc GPL %doc LEGAL %{_bindir}/erb %{_bindir}/%{name}%{?with_rubypick:-mri} -%{_bindir}/testrb %{_mandir}/man1/erb* %{_mandir}/man1/ruby* @@ -591,7 +576,9 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %exclude %{_libdir}/libruby-static.a %files devel -%doc COPYING* +%doc BSDL +%doc COPYING +%lang(ja) %doc COPYING.ja %doc GPL %doc LEGAL %doc README.EXT @@ -608,8 +595,8 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %lang(ja) %doc COPYING.ja %doc GPL %doc LEGAL -%doc README -%lang(ja) %doc README.ja +%doc README.md +%lang(ja) %doc README.ja.md %doc NEWS %doc doc/NEWS-* # Exclude /usr/local directory since it is supposed to be managed by @@ -628,7 +615,6 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %exclude %{ruby_libdir}/tcltk.rb %exclude %{ruby_libdir}/tk*.rb %{ruby_libdir}/cgi -%{ruby_libdir}/date %{ruby_libdir}/digest %{ruby_libdir}/dl %{ruby_libdir}/drb @@ -646,7 +632,6 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/rss %{ruby_libdir}/shell %{ruby_libdir}/syslog -%{ruby_libdir}/test %exclude %{ruby_libdir}/tk %exclude %{ruby_libdir}/tkextlib %{ruby_libdir}/uri @@ -760,15 +745,6 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %{tapset_root} -# TODO rubygems 2.0.0 does not create test-unit gemspec -# TODO for now put this in ruby-libs rpm -# TODO check if the following can be removed after -# TODO test-unit rebuild -%dir %{gem_dir} -%dir %{gem_dir}/specifications -%dir %{gem_dir}/specifications/default -%{gem_dir}/specifications/default/test-unit-*.gemspec - %files -n rubygems %{_bindir}/gem %{rubygems_dir} @@ -788,9 +764,6 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %exclude %{gem_dir}/specifications/rake-%{rake_version}.gemspec %exclude %{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec %exclude %{gem_dir}/specifications/psych-%{psych_version}.gemspec -# TODO rubygems 2.0.0 does not create test-unit gemspec -# TODO where to put test-unit-*.gemspec?? -%exclude %{gem_dir}/specifications/default/test-unit-*.gemspec %files -n rubygems-devel %{_rpmconfigdir}/macros.d/macros.rubygems @@ -818,8 +791,8 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %{_mandir}/man1/ri* %files doc -%doc README -%lang(ja) %doc README.ja +%doc README.md +%lang(ja) %doc README.ja.md %doc ChangeLog %doc doc/ChangeLog-* %doc ruby-exercise.stp @@ -866,6 +839,9 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog +* Wed Aug 27 2014 Vít Ondruch - 2.2.0-0.24.r47288 +- Upgrade to Ruby 2.2.0 (r47288). + * Mon Aug 25 2014 Vít Ondruch - 2.1.2-24 - Use load macro introduced in RPM 4.12. From 6cdbb78865eb56a389f29c14f08e4f468be82d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 28 Aug 2014 12:24:16 +0200 Subject: [PATCH 02/27] List RubyGems directories and extract test-unit and power_assert into sub-packages. - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. --- ruby.spec | 82 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 63 insertions(+), 19 deletions(-) diff --git a/ruby.spec b/ruby.spec index fe406a2..4efb7ff 100644 --- a/ruby.spec +++ b/ruby.spec @@ -38,9 +38,11 @@ %global io_console_version 0.4.2 %global json_version 1.8.1 %global minitest_version 5.4.0 +%global power_assert_version 0.1.3 %global psych_version 2.0.5 %global rake_version 10.3.2 %global rdoc_version 4.1.0 +%global test_unit_version 3.0.0 # Might not be needed in the future, if we are lucky enough. # https://bugzilla.redhat.com/show_bug.cgi?id=888262 @@ -325,6 +327,22 @@ minitest/pride shows pride in testing and adds coloring to your test output. +# The Summary/Description fields are rather poor. +# https://github.com/k-tsj/power_assert/issues/3 +%package -n rubygem-power_assert +Summary: Power Assert for Ruby +Version: %{power_assert_version} +Group: Development/Libraries +License: Ruby or BSD +Requires: ruby(release) +Requires: ruby(rubygems) >= %{rubygems_version} +Provides: rubygem(power_assert) = %{version}-%{release} +BuildArch: noarch + +%description -n rubygem-power_assert +Power Assert for Ruby. + + %package -n rubygem-psych Summary: A libyaml wrapper for Ruby Version: %{psych_version} @@ -341,6 +359,26 @@ capabilities. In addition to wrapping libyaml, Psych also knows how to serialize and de-serialize most Ruby objects to and from the YAML format. +# The Summary/Description fields are rather poor. +# https://github.com/test-unit/test-unit/issues/73 +%package -n rubygem-test-unit +Summary: Improved version of Test::Unit bundled in Ruby 1.8.x +Version: %{test_unit_version} +Group: Development/Libraries +# lib/test/unit/diff.rb is a double license of the Ruby license and PSF license. +# lib/test-unit.rb is a dual license of the Ruby license and LGPLv2.1 or later. +License: (Ruby or BSD) and (Ruby or BSD or Python) and (Ruby or BSD or LGPLv2+) +Requires: ruby(release) +Requires: ruby(rubygems) >= %{rubygems_version} +Provides: rubygem(test-unit) = %{version}-%{release} +BuildArch: noarch + +%description -n rubygem-test-unit +Ruby 1.9.x bundles minitest not Test::Unit. Test::Unit +bundled in Ruby 1.8.x had not been improved but unbundled +Test::Unit (test-unit) is improved actively. + + %package tcltk Summary: Tcl/Tk interface for scripting language Ruby Group: Development/Languages @@ -513,9 +551,6 @@ sed -i '/^end$/ i\ s.require_paths = ["lib"]\ s.extensions = ["json/ext/parser.so", "json/ext/generator.so"]' %{buildroot}%{gem_dir}/specifications/json-%{json_version}.gemspec -sed -i '/^end$/ i\ - s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/specifications/minitest-%{minitest_version}.gemspec - # Install a tapset and fix up the path to the library. mkdir -p %{buildroot}%{tapset_dir} sed -e "s|@LIBRARY_PATH@|%{tapset_libdir}/libruby.so.%{ruby_version}|" \ @@ -748,22 +783,21 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %files -n rubygems %{_bindir}/gem %{rubygems_dir} -%{gem_dir} -%exclude %{gem_dir}/gems/* -%{_exec_prefix}/lib*/gems -%exclude %{_exec_prefix}/lib*/gems/%{name}/bigdecimal-%{bigdecimal_version} -%exclude %{_exec_prefix}/lib*/gems/%{name}/io-console-%{io_console_version} -%exclude %{_exec_prefix}/lib*/gems/%{name}/json-%{json_version} -%exclude %{_exec_prefix}/lib*/gems/%{name}/psych-%{psych_version} -%exclude %{gem_dir}/gems/rake-%{rake_version} -%exclude %{gem_dir}/gems/rdoc-%{rdoc_version} -%exclude %{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec -%exclude %{gem_dir}/specifications/io-console-%{io_console_version}.gemspec -%exclude %{gem_dir}/specifications/json-%{json_version}.gemspec -%exclude %{gem_dir}/specifications/minitest-%{minitest_version}.gemspec -%exclude %{gem_dir}/specifications/rake-%{rake_version}.gemspec -%exclude %{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec -%exclude %{gem_dir}/specifications/psych-%{psych_version}.gemspec + +# Explicitly include only RubyGems directory strucure to avoid accidentally +# packaged content. +%dir %{gem_dir} +%dir %{gem_dir}/build_info +%dir %{gem_dir}/cache +%dir %{gem_dir}/doc +%dir %{gem_dir}/extensions +%dir %{gem_dir}/gems +%dir %{gem_dir}/specifications +%dir %{gem_dir}/specifications/default +%dir %{_exec_prefix}/lib*/gems +%dir %{_exec_prefix}/lib*/gems/ruby + +%exclude %{gem_dir}/cache/* %files -n rubygems-devel %{_rpmconfigdir}/macros.d/macros.rubygems @@ -821,6 +855,10 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/gems/minitest-%{minitest_version} %{gem_dir}/specifications/minitest-%{minitest_version}.gemspec +%files -n rubygem-power_assert +%{gem_dir}/gems/power_assert-%{power_assert_version} +%{gem_dir}/specifications/power_assert-%{power_assert_version}.gemspec + %files -n rubygem-psych %{ruby_vendorlibdir}/psych %{ruby_vendorlibdir}/psych.rb @@ -829,6 +867,10 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/gems/psych-%{psych_version} %{gem_dir}/specifications/psych-%{psych_version}.gemspec +%files -n rubygem-test-unit +%{gem_dir}/gems/test-unit-%{test_unit_version} +%{gem_dir}/specifications/test-unit-%{test_unit_version}.gemspec + %files tcltk %{ruby_libdir}/*-tk.rb %{ruby_libdir}/tcltk.rb @@ -841,6 +883,8 @@ OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" %changelog * Wed Aug 27 2014 Vít Ondruch - 2.2.0-0.24.r47288 - Upgrade to Ruby 2.2.0 (r47288). +- Explicitly list RubyGems directories to avoid accidentaly packaged content. +- Split test-unit and power_assert gems into separate sub-packages. * Mon Aug 25 2014 Vít Ondruch - 2.1.2-24 - Use load macro introduced in RPM 4.12. From 8fa17d3469b0e3f8014874bcbf8956ce379812d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 28 Aug 2014 13:20:31 +0200 Subject: [PATCH 03/27] Remove MD5 workaround, since this issue was resolved upstream https://bugs.ruby-lang.org/issues/9154 --- ruby.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ruby.spec b/ruby.spec index 4efb7ff..8186125 100644 --- a/ruby.spec +++ b/ruby.spec @@ -588,9 +588,7 @@ sed -i "/^ gem 'minitest', '~> 4.0'/ s/^/#/" lib/rubygems/test_case.rb # https://bugs.ruby-lang.org/issues/9198 sed -i '/^ def test_machine_stackoverflow/,/^ end/ s/^/#/' test/ruby/test_exception.rb -# Allow MD5 in OpenSSL. -# https://bugs.ruby-lang.org/issues/9154 -OPENSSL_ENABLE_MD5_VERIFY=1 make check TESTS="-v $DISABLE_TESTS" +make check TESTS="-v $DISABLE_TESTS" %post libs -p /sbin/ldconfig From 36dc26c4c731870d2dd43b2eee69aba4a5b680d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 5 Sep 2014 10:52:30 +0200 Subject: [PATCH 04/27] Upgrade to Ruby 2.2.0 (r47372). --- ...delay-arbitrarily-because-Ruby-is-no.patch | 26 +++++++++++++++ ruby.spec | 32 ++++++++----------- 2 files changed, 40 insertions(+), 18 deletions(-) create mode 100644 ruby-2.2.0-Revert-Ruby-can-delay-arbitrarily-because-Ruby-is-no.patch diff --git a/ruby-2.2.0-Revert-Ruby-can-delay-arbitrarily-because-Ruby-is-no.patch b/ruby-2.2.0-Revert-Ruby-can-delay-arbitrarily-because-Ruby-is-no.patch new file mode 100644 index 0000000..b2d797c --- /dev/null +++ b/ruby-2.2.0-Revert-Ruby-can-delay-arbitrarily-because-Ruby-is-no.patch @@ -0,0 +1,26 @@ +From 7118da590722e7718856d7ab7c832aa2570ec614 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADt=20Ondruch?= +Date: Wed, 3 Sep 2014 14:41:53 +0200 +Subject: [PATCH] Revert "Ruby can delay arbitrarily because Ruby is not a + realtime system, " + +This reverts commit 50190956c261986f96025a7a2b4b12cc51507448. +--- + test/benchmark/test_benchmark.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/benchmark/test_benchmark.rb b/test/benchmark/test_benchmark.rb +index 1b9964e..59207c7 100644 +--- a/test/benchmark/test_benchmark.rb ++++ b/test/benchmark/test_benchmark.rb +@@ -156,6 +156,6 @@ BENCH + def test_realtime_output + sleeptime = 1.0 + realtime = Benchmark.realtime { sleep sleeptime } +- assert_operator sleeptime, :<, realtime ++ assert_in_epsilon sleeptime, realtime + end + end +-- +1.9.3 + diff --git a/ruby.spec b/ruby.spec index 8186125..f2479d3 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone preview2 # Keep the revision enabled for pre-releases from SVN. -%global revision 47288 +%global revision 47372 %global ruby_archive %{name}-%{ruby_version} @@ -105,6 +105,9 @@ Patch5: ruby-1.9.3-mkmf-verbose.patch # in support for ABRT. # http://bugs.ruby-lang.org/issues/8566 Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +# TestBenchmark#test_realtime_output breaks on ARM. +# https://bugs.ruby-lang.org/issues/10202 +Patch7: ruby-2.2.0-Revert-Ruby-can-delay-arbitrarily-because-Ruby-is-no.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: ruby(rubygems) >= %{rubygems_version} @@ -397,6 +400,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -565,10 +569,14 @@ DISABLE_TESTS="" # test_call_double(DL::TestDL) fails on ARM HardFP # http://bugs.ruby-lang.org/issues/6592 DISABLE_TESTS="-x test_dl2.rb $DISABLE_TESTS" +%endif -# Workaround OpenSSL::TestPKeyRSA#test_sign_verify_memory_leak timeouts on ARM. -# https://bugs.ruby-lang.org/issues/9984 -sed -i -e 's|20_000|10_000|g' test/openssl/test_pkey_rsa.rb +%ifarch i686 +# TestSprintf#test_float fails on i686 +# https://bugs.ruby-lang.org/issues/10120 +# https://bugzilla.redhat.com/show_bug.cgi?id=1101811 +sed -i "/assert_equal(\"0x1p+2\", sprintf('%.0a', Float('0x1.fp+1')), \"\[ruby-dev:42551\]\")/ s/^/#/" test/ruby/test_sprintf.rb +sed -i "/assert_equal(\"-0x1.0p+2\", sprintf('%.1a', Float('-0x1.ffp+1')), \"\[ruby-dev:42551\]\")/ s/^/#/" test/ruby/test_sprintf.rb %endif # test_debug(TestRubyOptions) fails due to LoadError reported in debug mode, @@ -576,18 +584,6 @@ sed -i -e 's|20_000|10_000|g' test/openssl/test_pkey_rsa.rb # the test suite). touch abrt.rb -# TestSignal#test_hup_me hangs up the test suite. -# http://bugs.ruby-lang.org/issues/8997 -sed -i '/def test_hup_me/,/end if Process.respond_to/ s/^/#/' test/ruby/test_signal.rb - -# Fix "Could not find 'minitest'" error. -# http://bugs.ruby-lang.org/issues/9259 -sed -i "/^ gem 'minitest', '~> 4.0'/ s/^/#/" lib/rubygems/test_case.rb - -# Segmentation fault. -# https://bugs.ruby-lang.org/issues/9198 -sed -i '/^ def test_machine_stackoverflow/,/^ end/ s/^/#/' test/ruby/test_exception.rb - make check TESTS="-v $DISABLE_TESTS" %post libs -p /sbin/ldconfig @@ -879,8 +875,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Wed Aug 27 2014 Vít Ondruch - 2.2.0-0.24.r47288 -- Upgrade to Ruby 2.2.0 (r47288). +* Wed Aug 27 2014 Vít Ondruch - 2.2.0-0.24.r47372 +- Upgrade to Ruby 2.2.0 (r47372). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. From 86042c7862b4f654ede972b73d4560d831b51c2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 11 Sep 2014 12:44:12 +0200 Subject: [PATCH 05/27] Upgrade to Ruby 2.2.0 (r47525). --- ruby.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ruby.spec b/ruby.spec index f2479d3..ba92632 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone preview2 # Keep the revision enabled for pre-releases from SVN. -%global revision 47372 +%global revision 47525 %global ruby_archive %{name}-%{ruby_version} @@ -41,7 +41,7 @@ %global power_assert_version 0.1.3 %global psych_version 2.0.5 %global rake_version 10.3.2 -%global rdoc_version 4.1.0 +%global rdoc_version 4.2.0.alpha %global test_unit_version 3.0.0 # Might not be needed in the future, if we are lucky enough. @@ -584,6 +584,12 @@ sed -i "/assert_equal(\"-0x1.0p+2\", sprintf('%.1a', Float('-0x1.ffp+1')), \"\[r # the test suite). touch abrt.rb +# Don't test wrap ciphers to prevent "OpenSSL::Cipher::CipherError: wrap mode +# not allowed" error. +# https://bugs.ruby-lang.org/issues/10229 +sed -i '/assert(OpenSSL::Cipher::Cipher.new(name).is_a?(OpenSSL::Cipher::Cipher))/i \ + next if /wrap/ =~ name' test/openssl/test_cipher.rb + make check TESTS="-v $DISABLE_TESTS" %post libs -p /sbin/ldconfig @@ -875,8 +881,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Wed Aug 27 2014 Vít Ondruch - 2.2.0-0.24.r47372 -- Upgrade to Ruby 2.2.0 (r47372). +* Wed Aug 27 2014 Vít Ondruch - 2.2.0-0.24.r47525 +- Upgrade to Ruby 2.2.0 (r47525). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. From 212709a903469f15e2d8b3915d75d3ee5c85135f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 15 Sep 2014 16:48:16 +0200 Subject: [PATCH 06/27] Upgrade to Ruby 2.2.0 (r47594). --- ...delay-arbitrarily-because-Ruby-is-no.patch | 26 --------- ...rt-earlier-rubyies-following-0a8b54d.patch | 57 +++++++++++++++++++ ruby.spec | 23 +++++--- 3 files changed, 71 insertions(+), 35 deletions(-) delete mode 100644 ruby-2.2.0-Revert-Ruby-can-delay-arbitrarily-because-Ruby-is-no.patch create mode 100644 ruby-2.2.0-Revert-Support-earlier-rubyies-following-0a8b54d.patch diff --git a/ruby-2.2.0-Revert-Ruby-can-delay-arbitrarily-because-Ruby-is-no.patch b/ruby-2.2.0-Revert-Ruby-can-delay-arbitrarily-because-Ruby-is-no.patch deleted file mode 100644 index b2d797c..0000000 --- a/ruby-2.2.0-Revert-Ruby-can-delay-arbitrarily-because-Ruby-is-no.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7118da590722e7718856d7ab7c832aa2570ec614 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADt=20Ondruch?= -Date: Wed, 3 Sep 2014 14:41:53 +0200 -Subject: [PATCH] Revert "Ruby can delay arbitrarily because Ruby is not a - realtime system, " - -This reverts commit 50190956c261986f96025a7a2b4b12cc51507448. ---- - test/benchmark/test_benchmark.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/benchmark/test_benchmark.rb b/test/benchmark/test_benchmark.rb -index 1b9964e..59207c7 100644 ---- a/test/benchmark/test_benchmark.rb -+++ b/test/benchmark/test_benchmark.rb -@@ -156,6 +156,6 @@ BENCH - def test_realtime_output - sleeptime = 1.0 - realtime = Benchmark.realtime { sleep sleeptime } -- assert_operator sleeptime, :<, realtime -+ assert_in_epsilon sleeptime, realtime - end - end --- -1.9.3 - diff --git a/ruby-2.2.0-Revert-Support-earlier-rubyies-following-0a8b54d.patch b/ruby-2.2.0-Revert-Support-earlier-rubyies-following-0a8b54d.patch new file mode 100644 index 0000000..7454e42 --- /dev/null +++ b/ruby-2.2.0-Revert-Support-earlier-rubyies-following-0a8b54d.patch @@ -0,0 +1,57 @@ +From 29603663ca4aa9abfc2c9be02db11b08fcccea89 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADt=20Ondruch?= +Date: Mon, 15 Sep 2014 12:48:05 +0200 +Subject: [PATCH] Revert "Support earlier rubyies following @0a8b54d" + +This reverts commit 1a7a043e242374c87e5b7c731480446037a344a5. +--- + lib/rubygems.rb | 4 ++-- + lib/rubygems/name_tuple.rb | 2 +- + lib/rubygems/source.rb | 2 -- + 3 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/lib/rubygems.rb b/lib/rubygems.rb +index 4535206..fc11724 100644 +--- a/lib/rubygems.rb ++++ b/lib/rubygems.rb +@@ -546,9 +546,9 @@ module Gem + # Fetching: minitest-3.0.1.gem (100%) + # => [#] + +- def self.install name, version = Gem::Requirement.default, *options ++ def self.install name, version = Gem::Requirement.default, **options + require "rubygems/dependency_installer" +- inst = Gem::DependencyInstaller.new(*options) ++ inst = Gem::DependencyInstaller.new(**options) + inst.install name, version + inst.installed_gems + end +diff --git a/lib/rubygems/name_tuple.rb b/lib/rubygems/name_tuple.rb +index 60323db..357aa40 100644 +--- a/lib/rubygems/name_tuple.rb ++++ b/lib/rubygems/name_tuple.rb +@@ -53,7 +53,7 @@ class Gem::NameTuple + "#{@name}-#{@version}" + else + "#{@name}-#{@version}-#{@platform}" +- end.untaint ++ end + end + + ## +diff --git a/lib/rubygems/source.rb b/lib/rubygems/source.rb +index 4858ffb..21c6559 100644 +--- a/lib/rubygems/source.rb ++++ b/lib/rubygems/source.rb +@@ -106,8 +106,6 @@ class Gem::Source + def cache_dir(uri) + # Correct for windows paths + escaped_path = uri.path.sub(/^\/([a-z]):\//i, '/\\1-/') +- escaped_path.untaint +- + File.join Gem.spec_cache_dir, "#{uri.host}%#{uri.port}", File.dirname(escaped_path) + end + +-- +1.9.3 + diff --git a/ruby.spec b/ruby.spec index ba92632..b7109f3 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone preview2 # Keep the revision enabled for pre-releases from SVN. -%global revision 47525 +%global revision 47594 %global ruby_archive %{name}-%{ruby_version} @@ -37,12 +37,12 @@ %global bigdecimal_version 1.2.5 %global io_console_version 0.4.2 %global json_version 1.8.1 -%global minitest_version 5.4.0 +%global minitest_version 5.4.1 %global power_assert_version 0.1.3 -%global psych_version 2.0.5 +%global psych_version 2.0.6 %global rake_version 10.3.2 %global rdoc_version 4.2.0.alpha -%global test_unit_version 3.0.0 +%global test_unit_version 3.0.1 # Might not be needed in the future, if we are lucky enough. # https://bugzilla.redhat.com/show_bug.cgi?id=888262 @@ -105,9 +105,9 @@ Patch5: ruby-1.9.3-mkmf-verbose.patch # in support for ABRT. # http://bugs.ruby-lang.org/issues/8566 Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch -# TestBenchmark#test_realtime_output breaks on ARM. -# https://bugs.ruby-lang.org/issues/10202 -Patch7: ruby-2.2.0-Revert-Ruby-can-delay-arbitrarily-because-Ruby-is-no.patch +# Prevents 'make install' error during installation of bundled gems. +# https://github.com/rubygems/rubygems/issues/1013 +Patch7: ruby-2.2.0-Revert-Support-earlier-rubyies-following-0a8b54d.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: ruby(rubygems) >= %{rubygems_version} @@ -590,6 +590,11 @@ touch abrt.rb sed -i '/assert(OpenSSL::Cipher::Cipher.new(name).is_a?(OpenSSL::Cipher::Cipher))/i \ next if /wrap/ =~ name' test/openssl/test_cipher.rb +# Disable failing TestTimeTZ#test_gen_Europe_Lisbon_111 for now. Lest blame +# tzdata-2014g-1.fc22 for now, since it works with older versions. +# https://bugzilla.redhat.com/show_bug.cgi?id=1141775 +sed -i '/^Europe\/Lisbon/ s/^/#/' test/ruby/test_time_tz.rb + make check TESTS="-v $DISABLE_TESTS" %post libs -p /sbin/ldconfig @@ -881,8 +886,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Wed Aug 27 2014 Vít Ondruch - 2.2.0-0.24.r47525 -- Upgrade to Ruby 2.2.0 (r47525). +* Wed Aug 27 2014 Vít Ondruch - 2.2.0-0.24.r47594 +- Upgrade to Ruby 2.2.0 (r47594). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. From aa1612bdea5bbfca227925d99b116b7fbab6cb08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 15 Sep 2014 18:09:00 +0200 Subject: [PATCH 07/27] Fix RubyGems version. --- ruby.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index b7109f3..a28418c 100644 --- a/ruby.spec +++ b/ruby.spec @@ -24,7 +24,7 @@ %global release 24 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} -%global rubygems_version 2.2.2 +%global rubygems_version 2.4.1 # The RubyGems library has to stay out of Ruby directory three, since the # RubyGems should be share by all Ruby implementations. From 37788299d5bfc785afbc4832315d0f18a53003f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 14 Oct 2014 09:53:50 +0200 Subject: [PATCH 08/27] Upgrade to Ruby 2.2.0 (r47902). --- ruby-1.9.3-mkmf-verbose.patch | 2 +- ...-additional-preludes-by-configuratio.patch | 4 +- ...0-Enable-configuration-of-archlibdir.patch | 2 +- ...ed-paths-when-empty-version-string-i.patch | 6 +- ruby-2.1.0-always-use-i386.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 6 +- ...rt-earlier-rubyies-following-0a8b54d.patch | 57 ------------------- ruby.spec | 19 ++----- 8 files changed, 16 insertions(+), 82 deletions(-) delete mode 100644 ruby-2.2.0-Revert-Support-earlier-rubyies-following-0a8b54d.patch diff --git a/ruby-1.9.3-mkmf-verbose.patch b/ruby-1.9.3-mkmf-verbose.patch index eb33679..13148ce 100644 --- a/ruby-1.9.3-mkmf-verbose.patch +++ b/ruby-1.9.3-mkmf-verbose.patch @@ -11,7 +11,7 @@ diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 682eb46..e6b1445 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb -@@ -1842,7 +1842,7 @@ SRC +@@ -1858,7 +1858,7 @@ SRC SHELL = /bin/sh # V=0 quiet, V=1 verbose. other values don't work. diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index 4df3eeb..21489ec 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -26,7 +26,7 @@ diff --git a/common.mk b/common.mk index 5cfbc3d..3f0a82e 100644 --- a/common.mk +++ b/common.mk -@@ -111,7 +111,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) +@@ -113,7 +113,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) DEFAULT_PRELUDES = $(GEM_PRELUDE) @@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in index 0e371e2..d4f1dcb 100644 --- a/configure.in +++ b/configure.in -@@ -4078,6 +4078,13 @@ AC_SUBST(rubyarchhdrdir)dnl +@@ -4103,6 +4103,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index c20b24e..c871b7e 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 37d9a62..553d4d0 100644 --- a/configure.in +++ b/configure.in -@@ -3301,6 +3301,11 @@ if test ${multiarch+set}; then +@@ -3325,6 +3325,11 @@ if test ${multiarch+set}; then fi archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index ea19698..700b5a2 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in index 17ed3ed..5843651 100644 --- a/configure.in +++ b/configure.in -@@ -3885,8 +3885,6 @@ AS_CASE(["$target_os"], +@@ -3909,8 +3909,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -23,7 +23,7 @@ index 17ed3ed..5843651 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, -@@ -3916,6 +3914,7 @@ AC_ARG_WITH(ruby-version, +@@ -3940,6 +3938,7 @@ AC_ARG_WITH(ruby-version, [ruby_version=full]) unset RUBY_LIB_VERSION unset RUBY_LIB_VERSION_STYLE @@ -31,7 +31,7 @@ index 17ed3ed..5843651 100644 AS_CASE(["$ruby_version"], [full], [RUBY_LIB_VERSION_STYLE='3 /* full */'], [minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */']) -@@ -3932,30 +3931,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then +@@ -3956,30 +3955,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`" eval $ruby_version elif test -z "${ruby_version}"; then diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index 3a83179..9b7d60a 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 553d4d0..03a4152 100644 --- a/configure.in +++ b/configure.in -@@ -3997,6 +3997,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4021,6 +4021,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index b807a8c..ea40c40 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in index 03a4152..0e371e2 100644 --- a/configure.in +++ b/configure.in -@@ -3971,6 +3971,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -3995,6 +3995,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644 if test "${LOAD_RELATIVE+set}"; then AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -3994,6 +3998,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4018,6 +4022,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl @@ -90,7 +90,7 @@ index b47b6e1..0b99408 100755 + end end - install?(:local, :arch, :lib) do + install?(:local, :comm, :hdr, :'comm-hdr') do -- 1.8.3.1 diff --git a/ruby-2.2.0-Revert-Support-earlier-rubyies-following-0a8b54d.patch b/ruby-2.2.0-Revert-Support-earlier-rubyies-following-0a8b54d.patch deleted file mode 100644 index 7454e42..0000000 --- a/ruby-2.2.0-Revert-Support-earlier-rubyies-following-0a8b54d.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 29603663ca4aa9abfc2c9be02db11b08fcccea89 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADt=20Ondruch?= -Date: Mon, 15 Sep 2014 12:48:05 +0200 -Subject: [PATCH] Revert "Support earlier rubyies following @0a8b54d" - -This reverts commit 1a7a043e242374c87e5b7c731480446037a344a5. ---- - lib/rubygems.rb | 4 ++-- - lib/rubygems/name_tuple.rb | 2 +- - lib/rubygems/source.rb | 2 -- - 3 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/lib/rubygems.rb b/lib/rubygems.rb -index 4535206..fc11724 100644 ---- a/lib/rubygems.rb -+++ b/lib/rubygems.rb -@@ -546,9 +546,9 @@ module Gem - # Fetching: minitest-3.0.1.gem (100%) - # => [#] - -- def self.install name, version = Gem::Requirement.default, *options -+ def self.install name, version = Gem::Requirement.default, **options - require "rubygems/dependency_installer" -- inst = Gem::DependencyInstaller.new(*options) -+ inst = Gem::DependencyInstaller.new(**options) - inst.install name, version - inst.installed_gems - end -diff --git a/lib/rubygems/name_tuple.rb b/lib/rubygems/name_tuple.rb -index 60323db..357aa40 100644 ---- a/lib/rubygems/name_tuple.rb -+++ b/lib/rubygems/name_tuple.rb -@@ -53,7 +53,7 @@ class Gem::NameTuple - "#{@name}-#{@version}" - else - "#{@name}-#{@version}-#{@platform}" -- end.untaint -+ end - end - - ## -diff --git a/lib/rubygems/source.rb b/lib/rubygems/source.rb -index 4858ffb..21c6559 100644 ---- a/lib/rubygems/source.rb -+++ b/lib/rubygems/source.rb -@@ -106,8 +106,6 @@ class Gem::Source - def cache_dir(uri) - # Correct for windows paths - escaped_path = uri.path.sub(/^\/([a-z]):\//i, '/\\1-/') -- escaped_path.untaint -- - File.join Gem.spec_cache_dir, "#{uri.host}%#{uri.port}", File.dirname(escaped_path) - end - --- -1.9.3 - diff --git a/ruby.spec b/ruby.spec index a28418c..c6071b5 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone preview2 # Keep the revision enabled for pre-releases from SVN. -%global revision 47594 +%global revision 47902 %global ruby_archive %{name}-%{ruby_version} @@ -24,7 +24,7 @@ %global release 24 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} -%global rubygems_version 2.4.1 +%global rubygems_version 2.4.2 # The RubyGems library has to stay out of Ruby directory three, since the # RubyGems should be share by all Ruby implementations. @@ -38,7 +38,7 @@ %global io_console_version 0.4.2 %global json_version 1.8.1 %global minitest_version 5.4.1 -%global power_assert_version 0.1.3 +%global power_assert_version 0.1.4 %global psych_version 2.0.6 %global rake_version 10.3.2 %global rdoc_version 4.2.0.alpha @@ -105,9 +105,6 @@ Patch5: ruby-1.9.3-mkmf-verbose.patch # in support for ABRT. # http://bugs.ruby-lang.org/issues/8566 Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch -# Prevents 'make install' error during installation of bundled gems. -# https://github.com/rubygems/rubygems/issues/1013 -Patch7: ruby-2.2.0-Revert-Support-earlier-rubyies-following-0a8b54d.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: ruby(rubygems) >= %{rubygems_version} @@ -400,7 +397,6 @@ Tcl/Tk interface for the object-oriented scripting language Ruby. %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -590,11 +586,6 @@ touch abrt.rb sed -i '/assert(OpenSSL::Cipher::Cipher.new(name).is_a?(OpenSSL::Cipher::Cipher))/i \ next if /wrap/ =~ name' test/openssl/test_cipher.rb -# Disable failing TestTimeTZ#test_gen_Europe_Lisbon_111 for now. Lest blame -# tzdata-2014g-1.fc22 for now, since it works with older versions. -# https://bugzilla.redhat.com/show_bug.cgi?id=1141775 -sed -i '/^Europe\/Lisbon/ s/^/#/' test/ruby/test_time_tz.rb - make check TESTS="-v $DISABLE_TESTS" %post libs -p /sbin/ldconfig @@ -886,8 +877,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Wed Aug 27 2014 Vít Ondruch - 2.2.0-0.24.r47594 -- Upgrade to Ruby 2.2.0 (r47594). +* Tue Oct 14 2014 Vít Ondruch - 2.2.0-0.24.r47902 +- Upgrade to Ruby 2.2.0 (r47902). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. From 0f0531865374080baa48f38b6b736e0361884cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 14 Oct 2014 11:25:42 +0200 Subject: [PATCH 09/27] Include only vendor directories, not their content. --- ruby.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby.spec b/ruby.spec index c6071b5..fc7373e 100644 --- a/ruby.spec +++ b/ruby.spec @@ -634,8 +634,8 @@ make check TESTS="-v $DISABLE_TESTS" # local system administrator. %exclude %{ruby_sitelibdir} %exclude %{ruby_sitearchdir} -%{ruby_vendorlibdir} -%{ruby_vendorarchdir} +%dir %{ruby_vendorlibdir} +%dir %{ruby_vendorarchdir} # List all these files explicitly to prevent surprises # Platform independent libraries. From fa33e440f688d962bbe33b8abefd0604708b144a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 15 Oct 2014 13:44:27 +0200 Subject: [PATCH 10/27] Ignore dot files. --- ruby.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ruby.spec b/ruby.spec index fc7373e..6d6fa8b 100644 --- a/ruby.spec +++ b/ruby.spec @@ -849,10 +849,12 @@ make check TESTS="-v $DISABLE_TESTS" %files -n rubygem-minitest %{gem_dir}/gems/minitest-%{minitest_version} +%exclude %{gem_dir}/gems/minitest-%{minitest_version}/.* %{gem_dir}/specifications/minitest-%{minitest_version}.gemspec %files -n rubygem-power_assert %{gem_dir}/gems/power_assert-%{power_assert_version} +%exclude %{gem_dir}/gems/power_assert-%{power_assert_version}/.* %{gem_dir}/specifications/power_assert-%{power_assert_version}.gemspec %files -n rubygem-psych From 63db21d33e957b6af700955805672814d7933200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 15 Oct 2014 13:45:43 +0200 Subject: [PATCH 11/27] Upgrade to Ruby 2.2.0 (r47940). --- ruby.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruby.spec b/ruby.spec index 6d6fa8b..8287aa2 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone preview2 # Keep the revision enabled for pre-releases from SVN. -%global revision 47902 +%global revision 47940 %global ruby_archive %{name}-%{ruby_version} @@ -879,8 +879,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Tue Oct 14 2014 Vít Ondruch - 2.2.0-0.24.r47902 -- Upgrade to Ruby 2.2.0 (r47902). +* Wed Oct 15 2014 Vít Ondruch - 2.2.0-0.24.r47940 +- Upgrade to Ruby 2.2.0 (r47940). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. From 16d9da4c30d9ff460faac2f06735090ad796bf7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 10 Nov 2014 17:51:55 +0100 Subject: [PATCH 12/27] Upgrade to Ruby 2.2.0 (r48365). --- ruby.spec | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/ruby.spec b/ruby.spec index 8287aa2..53730f1 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone preview2 # Keep the revision enabled for pre-releases from SVN. -%global revision 47940 +%global revision 48365 %global ruby_archive %{name}-%{ruby_version} @@ -37,12 +37,12 @@ %global bigdecimal_version 1.2.5 %global io_console_version 0.4.2 %global json_version 1.8.1 -%global minitest_version 5.4.1 -%global power_assert_version 0.1.4 +%global minitest_version 5.4.2 +%global power_assert_version 0.2.0 %global psych_version 2.0.6 %global rake_version 10.3.2 %global rdoc_version 4.2.0.alpha -%global test_unit_version 3.0.1 +%global test_unit_version 3.0.5 # Might not be needed in the future, if we are lucky enough. # https://bugzilla.redhat.com/show_bug.cgi?id=888262 @@ -561,12 +561,6 @@ sed -i -r "s|( \*.*\*)\/(.*)|\1\\\/\2|" %{buildroot}%{tapset_dir}/libruby.so.%{r %check DISABLE_TESTS="" -%ifarch armv7l armv7hl armv7hnl -# test_call_double(DL::TestDL) fails on ARM HardFP -# http://bugs.ruby-lang.org/issues/6592 -DISABLE_TESTS="-x test_dl2.rb $DISABLE_TESTS" -%endif - %ifarch i686 # TestSprintf#test_float fails on i686 # https://bugs.ruby-lang.org/issues/10120 @@ -647,7 +641,6 @@ make check TESTS="-v $DISABLE_TESTS" %exclude %{ruby_libdir}/tk*.rb %{ruby_libdir}/cgi %{ruby_libdir}/digest -%{ruby_libdir}/dl %{ruby_libdir}/drb %{ruby_libdir}/fiddle %exclude %{ruby_libdir}/irb @@ -665,6 +658,7 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/syslog %exclude %{ruby_libdir}/tk %exclude %{ruby_libdir}/tkextlib +%{ruby_libdir}/unicode_normalize %{ruby_libdir}/uri %{ruby_libdir}/webrick %{ruby_libdir}/xmlrpc @@ -684,9 +678,6 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libarchdir}/digest/rmd160.so %{ruby_libarchdir}/digest/sha1.so %{ruby_libarchdir}/digest/sha2.so -%dir %{ruby_libarchdir}/dl -%{ruby_libarchdir}/dl.so -%{ruby_libarchdir}/dl/callback.so %dir %{ruby_libarchdir}/enc %{ruby_libarchdir}/enc/big5.so %{ruby_libarchdir}/enc/cp949.so @@ -879,8 +870,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Wed Oct 15 2014 Vít Ondruch - 2.2.0-0.24.r47940 -- Upgrade to Ruby 2.2.0 (r47940). +* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.25.r48365 +- Upgrade to Ruby 2.2.0 (r48365). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. From 8c0bc69d65121932bfd17c87a8c6b3e8747c284a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 11 Nov 2014 09:32:09 +0100 Subject: [PATCH 13/27] Fix release in changelog. --- ruby.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index 53730f1..2defd95 100644 --- a/ruby.spec +++ b/ruby.spec @@ -870,7 +870,7 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.25.r48365 +* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.24.r48365 - Upgrade to Ruby 2.2.0 (r48365). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. From 2cd1c80dbfd41f0dc5b28e66f2f68feace81b86d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 18 Nov 2014 17:14:45 +0100 Subject: [PATCH 14/27] Upgrade to Ruby 2.2.0 (r48476). --- ...ify-additional-preludes-by-configuratio.patch | 8 ++++---- ruby.spec | 16 +++++++++------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index 21489ec..c7dc2e0 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -26,15 +26,15 @@ diff --git a/common.mk b/common.mk index 5cfbc3d..3f0a82e 100644 --- a/common.mk +++ b/common.mk -@@ -113,7 +113,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) +@@ -115,7 +115,7 @@ GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) DEFAULT_PRELUDES = $(GEM_PRELUDE) -PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES) +PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES) $(OPTIONAL_PRELUDES) - GEM_PRELUDE = $(srcdir)/gem_prelude.rb - PRELUDES = prelude.c miniprelude.c - GOLFPRELUDES = golf_prelude.c + GEM_PRELUDE = $(srcdir)/gem_prelude.rb + PRELUDES = {$(srcdir)}prelude.c {$(srcdir)}miniprelude.c + GOLFPRELUDES = {$(srcdir)}golf_prelude.c diff --git a/configure.in b/configure.in index 0e371e2..d4f1dcb 100644 --- a/configure.in diff --git a/ruby.spec b/ruby.spec index 2defd95..2be1c99 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone preview2 # Keep the revision enabled for pre-releases from SVN. -%global revision 48365 +%global revision 48476 %global ruby_archive %{name}-%{ruby_version} @@ -24,7 +24,7 @@ %global release 24 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} -%global rubygems_version 2.4.2 +%global rubygems_version 2.4.4 # The RubyGems library has to stay out of Ruby directory three, since the # RubyGems should be share by all Ruby implementations. @@ -37,12 +37,12 @@ %global bigdecimal_version 1.2.5 %global io_console_version 0.4.2 %global json_version 1.8.1 -%global minitest_version 5.4.2 +%global minitest_version 5.4.3 %global power_assert_version 0.2.0 %global psych_version 2.0.6 %global rake_version 10.3.2 %global rdoc_version 4.2.0.alpha -%global test_unit_version 3.0.5 +%global test_unit_version 3.0.6 # Might not be needed in the future, if we are lucky enough. # https://bugzilla.redhat.com/show_bug.cgi?id=888262 @@ -455,7 +455,9 @@ for cert in \ Class3PublicPrimaryCertificationAuthority.pem \ DigiCertHighAssuranceEVRootCA.pem \ EntrustnetSecureServerCertificationAuthority.pem \ - GeoTrustGlobalCA.pem + GeoTrustGlobalCA.pem \ + AddTrustExternalCARoot.pem \ + AddTrustExternalCARoot-2048.pem do rm %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/$cert done @@ -870,8 +872,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.24.r48365 -- Upgrade to Ruby 2.2.0 (r48365). +* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.24.r48476 +- Upgrade to Ruby 2.2.0 (r48476). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. From b651e4837e007b3b0f7b5395c2cee532abeb28df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 2 Dec 2014 17:35:13 +0100 Subject: [PATCH 15/27] Upgrade to Ruby 2.2.0-preview2. --- ...-additional-preludes-by-configuratio.patch | 6 ++--- ...0-Enable-configuration-of-archlibdir.patch | 2 +- ...ed-paths-when-empty-version-string-i.patch | 6 ++--- ruby-2.1.0-always-use-i386.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 4 +-- ruby.spec | 26 ++++++++++++++----- 6 files changed, 29 insertions(+), 17 deletions(-) diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index c7dc2e0..61568a0 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -13,7 +13,7 @@ diff --git a/Makefile.in b/Makefile.in index 7e8ed82..7916993 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -113,6 +113,8 @@ XRUBY_LIBDIR = @XRUBY_LIBDIR@ +@@ -114,6 +114,8 @@ XRUBY_LIBDIR = @XRUBY_LIBDIR@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ @@ -26,7 +26,7 @@ diff --git a/common.mk b/common.mk index 5cfbc3d..3f0a82e 100644 --- a/common.mk +++ b/common.mk -@@ -115,7 +115,7 @@ +@@ -115,7 +115,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) DEFAULT_PRELUDES = $(GEM_PRELUDE) @@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in index 0e371e2..d4f1dcb 100644 --- a/configure.in +++ b/configure.in -@@ -4103,6 +4103,13 @@ AC_SUBST(rubyarchhdrdir)dnl +@@ -4145,6 +4145,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index c871b7e..868ec43 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 37d9a62..553d4d0 100644 --- a/configure.in +++ b/configure.in -@@ -3325,6 +3325,11 @@ if test ${multiarch+set}; then +@@ -3367,6 +3367,11 @@ if test ${multiarch+set}; then fi archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index 700b5a2..e515ba0 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in index 17ed3ed..5843651 100644 --- a/configure.in +++ b/configure.in -@@ -3909,8 +3909,6 @@ AS_CASE(["$target_os"], +@@ -3951,8 +3951,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -23,7 +23,7 @@ index 17ed3ed..5843651 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, -@@ -3940,6 +3938,7 @@ AC_ARG_WITH(ruby-version, +@@ -3982,6 +3980,7 @@ AC_ARG_WITH(ruby-version, [ruby_version=full]) unset RUBY_LIB_VERSION unset RUBY_LIB_VERSION_STYLE @@ -31,7 +31,7 @@ index 17ed3ed..5843651 100644 AS_CASE(["$ruby_version"], [full], [RUBY_LIB_VERSION_STYLE='3 /* full */'], [minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */']) -@@ -3956,30 +3955,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then +@@ -3998,30 +3997,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`" eval $ruby_version elif test -z "${ruby_version}"; then diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index 9b7d60a..304d0a7 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 553d4d0..03a4152 100644 --- a/configure.in +++ b/configure.in -@@ -4021,6 +4021,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4063,6 +4063,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index ea40c40..9152df6 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in index 03a4152..0e371e2 100644 --- a/configure.in +++ b/configure.in -@@ -3995,6 +3995,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4037,6 +4037,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644 if test "${LOAD_RELATIVE+set}"; then AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4018,6 +4022,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4060,6 +4064,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl diff --git a/ruby.spec b/ruby.spec index 2be1c99..b0bcf0e 100644 --- a/ruby.spec +++ b/ruby.spec @@ -7,10 +7,10 @@ %global ruby_release %{ruby_version} # Specify the named version. It has precedense to revision. -#%%global milestone preview2 +%global milestone preview2 # Keep the revision enabled for pre-releases from SVN. -%global revision 48476 +#%%global revision 48629 %global ruby_archive %{name}-%{ruby_version} @@ -38,11 +38,11 @@ %global io_console_version 0.4.2 %global json_version 1.8.1 %global minitest_version 5.4.3 -%global power_assert_version 0.2.0 +%global power_assert_version 0.2.2 %global psych_version 2.0.6 -%global rake_version 10.3.2 +%global rake_version 10.4.0 %global rdoc_version 4.2.0.alpha -%global test_unit_version 3.0.6 +%global test_unit_version 3.0.7 # Might not be needed in the future, if we are lucky enough. # https://bugzilla.redhat.com/show_bug.cgi?id=888262 @@ -430,6 +430,13 @@ autoconf --enable-multiarch \ --with-prelude=./abrt_prelude.rb \ +# Avoid regeneration of prelude.c due to patch6 applied to common.mk. +# https://bugs.ruby-lang.org/issues/10554 +# TODO: Alternative solution might be to remove the path6 entirely and go +# ahead with the following proposal: +# https://bugs.ruby-lang.org/issues/8566#note-3 +touch prelude.c + # Q= makes the build output more verbose and allows to check Fedora # compiler options. make %{?_smp_mflags} COPY="cp -p" Q= @@ -582,6 +589,11 @@ touch abrt.rb sed -i '/assert(OpenSSL::Cipher::Cipher.new(name).is_a?(OpenSSL::Cipher::Cipher))/i \ next if /wrap/ =~ name' test/openssl/test_cipher.rb +# Test is broken due to SSLv3 disabled in Fedora. +# https://bugs.ruby-lang.org/issues/10046 +sed -i '/def test_ctx_client_session_cb$/,/^ end$/ s/^/#/' test/openssl/test_ssl_session.rb +sed -i '/def test_ctx_server_session_cb$/,/^ end$/ s/^/#/' test/openssl/test_ssl_session.rb + make check TESTS="-v $DISABLE_TESTS" %post libs -p /sbin/ldconfig @@ -872,8 +884,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.24.r48476 -- Upgrade to Ruby 2.2.0 (r48476). +* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.24.preview2 +- Upgrade to Ruby 2.2.0-preview2. - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. From 2fa5bddf120f905c2e550e438f189fe46e594a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 9 Dec 2014 09:46:51 +0100 Subject: [PATCH 16/27] Upgrade to Ruby 2.2.0 (r48741). --- ...licated-paths-when-empty-version-string-i.patch | 2 +- ruby.spec | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index e515ba0..02fa59f 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -39,7 +39,7 @@ index 17ed3ed..5843651 100644 + unset ruby_version_suffix + AC_DEFINE(RUBY_LIB_VERSION_BLANK, 1) else - RUBY_LIB_VERSION="\"${ruby_version}\"" + RUBY_LIB_VERSION="${ruby_version}" fi AC_SUBST(RUBY_LIB_VERSION_STYLE) AC_SUBST(RUBY_LIB_VERSION) diff --git a/ruby.spec b/ruby.spec index b0bcf0e..e5ac0b2 100644 --- a/ruby.spec +++ b/ruby.spec @@ -7,10 +7,10 @@ %global ruby_release %{ruby_version} # Specify the named version. It has precedense to revision. -%global milestone preview2 +#%%global milestone preview2 # Keep the revision enabled for pre-releases from SVN. -#%%global revision 48629 +%global revision 48741 %global ruby_archive %{name}-%{ruby_version} @@ -39,9 +39,9 @@ %global json_version 1.8.1 %global minitest_version 5.4.3 %global power_assert_version 0.2.2 -%global psych_version 2.0.6 -%global rake_version 10.4.0 -%global rdoc_version 4.2.0.alpha +%global psych_version 2.0.8 +%global rake_version 10.4.2 +%global rdoc_version 4.2.0 %global test_unit_version 3.0.7 # Might not be needed in the future, if we are lucky enough. @@ -884,8 +884,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.24.preview2 -- Upgrade to Ruby 2.2.0-preview2. +* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.24.r48741 +- Upgrade to Ruby 2.2.0 (r48741). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. From 8869002b19d5ee39824f42e608f32df026ea40f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 17 Dec 2014 13:54:48 +0100 Subject: [PATCH 17/27] Upgrade to Ruby 2.2.0 (r48879). --- ...ecify-additional-preludes-by-configuratio.patch | 2 +- ...-2.1.0-Enable-configuration-of-archlibdir.patch | 2 +- ...licated-paths-when-empty-version-string-i.patch | 6 +++--- ruby-2.1.0-always-use-i386.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 4 ++-- ruby.spec | 14 +++++++------- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index 61568a0..d0e53c6 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in index 0e371e2..d4f1dcb 100644 --- a/configure.in +++ b/configure.in -@@ -4145,6 +4145,13 @@ AC_SUBST(rubyarchhdrdir)dnl +@@ -4156,6 +4156,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 868ec43..7370052 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 37d9a62..553d4d0 100644 --- a/configure.in +++ b/configure.in -@@ -3367,6 +3367,11 @@ if test ${multiarch+set}; then +@@ -3378,6 +3378,11 @@ if test ${multiarch+set}; then fi archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index 02fa59f..73c16d4 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in index 17ed3ed..5843651 100644 --- a/configure.in +++ b/configure.in -@@ -3951,8 +3951,6 @@ AS_CASE(["$target_os"], +@@ -3962,8 +3962,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -23,7 +23,7 @@ index 17ed3ed..5843651 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, -@@ -3982,6 +3980,7 @@ AC_ARG_WITH(ruby-version, +@@ -3993,6 +3991,7 @@ AC_ARG_WITH(ruby-version, [ruby_version=full]) unset RUBY_LIB_VERSION unset RUBY_LIB_VERSION_STYLE @@ -31,7 +31,7 @@ index 17ed3ed..5843651 100644 AS_CASE(["$ruby_version"], [full], [RUBY_LIB_VERSION_STYLE='3 /* full */'], [minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */']) -@@ -3998,30 +3997,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then +@@ -4009,30 +4008,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`" eval $ruby_version elif test -z "${ruby_version}"; then diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index 304d0a7..ad0a203 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 553d4d0..03a4152 100644 --- a/configure.in +++ b/configure.in -@@ -4063,6 +4063,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4074,6 +4074,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index 9152df6..e467d3b 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in index 03a4152..0e371e2 100644 --- a/configure.in +++ b/configure.in -@@ -4037,6 +4037,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4048,6 +4048,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644 if test "${LOAD_RELATIVE+set}"; then AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4060,6 +4064,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4071,6 +4075,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl diff --git a/ruby.spec b/ruby.spec index e5ac0b2..d5ee478 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone preview2 # Keep the revision enabled for pre-releases from SVN. -%global revision 48741 +%global revision 48879 %global ruby_archive %{name}-%{ruby_version} @@ -21,7 +21,7 @@ %endif -%global release 24 +%global release 1 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} %global rubygems_version 2.4.4 @@ -35,14 +35,14 @@ %global irb_version %{ruby_version} %global bigdecimal_version 1.2.5 -%global io_console_version 0.4.2 +%global io_console_version 0.4.3 %global json_version 1.8.1 %global minitest_version 5.4.3 %global power_assert_version 0.2.2 %global psych_version 2.0.8 %global rake_version 10.4.2 %global rdoc_version 4.2.0 -%global test_unit_version 3.0.7 +%global test_unit_version 3.0.8 # Might not be needed in the future, if we are lucky enough. # https://bugzilla.redhat.com/show_bug.cgi?id=888262 @@ -469,7 +469,7 @@ do rm %{buildroot}%{rubygems_dir}/rubygems/ssl_certs/$cert done -# Move macros file insto proper place and replace the %%{name} macro, since it +# Move macros file into proper place and replace the %%{name} macro, since it # would be wrongly evaluated during build of other packages. mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d install -m 644 %{SOURCE4} %{buildroot}%{_rpmconfigdir}/macros.d/macros.ruby @@ -884,8 +884,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.24.r48741 -- Upgrade to Ruby 2.2.0 (r48741). +* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.1.r48879 +- Upgrade to Ruby 2.2.0 (r48879). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. From 304def6856eb19767294f762a3699e535efeb1b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 17 Dec 2014 17:06:14 +0100 Subject: [PATCH 18/27] Drop libdb dependency in favor of gdbm. --- ruby.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index d5ee478..d015e10 100644 --- a/ruby.spec +++ b/ruby.spec @@ -116,7 +116,6 @@ Requires: rubygem(bigdecimal) >= %{bigdecimal_version} BuildRequires: autoconf BuildRequires: gdbm-devel -BuildRequires: libdb-devel BuildRequires: libffi-devel BuildRequires: openssl-devel BuildRequires: libyaml-devel @@ -888,6 +887,7 @@ make check TESTS="-v $DISABLE_TESTS" - Upgrade to Ruby 2.2.0 (r48879). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. +- Drop libdb dependency in favor of gdbm. * Mon Aug 25 2014 Vít Ondruch - 2.1.2-24 - Use load macro introduced in RPM 4.12. From f9ae9cbc987fa3550ae7847c0f0d5069d2a9a2e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 17 Dec 2014 17:07:20 +0100 Subject: [PATCH 19/27] Remove bundled libyaml to be sure it is not used. --- ruby.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ruby.spec b/ruby.spec index d015e10..cb91721 100644 --- a/ruby.spec +++ b/ruby.spec @@ -390,6 +390,9 @@ Tcl/Tk interface for the object-oriented scripting language Ruby. %prep %setup -q -n %{ruby_archive} +# Remove bundled libyaml to be sure it is not used. +rm -rf ext/psych/yaml + %patch0 -p1 %patch1 -p1 %patch2 -p1 From e4cf284bcdc84ac3690fe18b7b2371d3af2b27e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 17 Dec 2014 18:33:58 +0100 Subject: [PATCH 20/27] Execute SystemTap sanity check. --- ruby.spec | 5 +++++ test_systemtap.rb | 9 +++++++++ 2 files changed, 14 insertions(+) create mode 100644 test_systemtap.rb diff --git a/ruby.spec b/ruby.spec index cb91721..edbba2c 100644 --- a/ruby.spec +++ b/ruby.spec @@ -81,6 +81,8 @@ Source7: config.h Source8: rubygems.attr Source9: rubygems.req Source10: rubygems.prov +# SystemTap sanity test case. +Source11: test_systemtap.rb # The load directive is supported since RPM 4.12, i.e. F21+. The build process # fails on older Fedoras. @@ -570,6 +572,9 @@ sed -e "s|@LIBRARY_PATH@|%{tapset_libdir}/libruby.so.%{ruby_version}|" \ sed -i -r "s|( \*.*\*)\/(.*)|\1\\\/\2|" %{buildroot}%{tapset_dir}/libruby.so.%{ruby_version}.stp %check +# Sanity check that SystemTap (dtrace) was detected. +make runruby TESTRUN_SCRIPT=%{SOURCE11} || exit 1 + DISABLE_TESTS="" %ifarch i686 diff --git a/test_systemtap.rb b/test_systemtap.rb new file mode 100644 index 0000000..aa8df4e --- /dev/null +++ b/test_systemtap.rb @@ -0,0 +1,9 @@ +require 'rbconfig' + +if RbConfig::CONFIG.select {|k, v| v =~ /dtrace/}.size == 1 + exit true +else + puts 'ERROR: SystemTap (dtrace) support was not detected.' + + exit false +end From 475c740c64cf03b3ec8375ff364ac195037e25f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 18 Dec 2014 13:34:22 +0100 Subject: [PATCH 21/27] The issue was resolved by r48844. --- ruby.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ruby.spec b/ruby.spec index edbba2c..a50554f 100644 --- a/ruby.spec +++ b/ruby.spec @@ -577,14 +577,6 @@ make runruby TESTRUN_SCRIPT=%{SOURCE11} || exit 1 DISABLE_TESTS="" -%ifarch i686 -# TestSprintf#test_float fails on i686 -# https://bugs.ruby-lang.org/issues/10120 -# https://bugzilla.redhat.com/show_bug.cgi?id=1101811 -sed -i "/assert_equal(\"0x1p+2\", sprintf('%.0a', Float('0x1.fp+1')), \"\[ruby-dev:42551\]\")/ s/^/#/" test/ruby/test_sprintf.rb -sed -i "/assert_equal(\"-0x1.0p+2\", sprintf('%.1a', Float('-0x1.ffp+1')), \"\[ruby-dev:42551\]\")/ s/^/#/" test/ruby/test_sprintf.rb -%endif - # test_debug(TestRubyOptions) fails due to LoadError reported in debug mode, # when abrt.rb cannot be required (seems to be easier way then customizing # the test suite). From 653216f6341341c76c383a0a489624893f9444cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 18 Dec 2014 13:46:26 +0100 Subject: [PATCH 22/27] Mobe Psych symlinks back to %{ruby_libdir}. This reverts commit 3a0654b687d5d9357c3e9bb80b90f82eff1c7d81. --- ruby.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/ruby.spec b/ruby.spec index a50554f..254a523 100644 --- a/ruby.spec +++ b/ruby.spec @@ -537,13 +537,9 @@ mkdir -p %{buildroot}%{_libdir}/gems/%{name}/psych-%{psych_version} mv %{buildroot}%{ruby_libdir}/psych* %{buildroot}%{gem_dir}/gems/psych-%{psych_version}/lib mv %{buildroot}%{ruby_libarchdir}/psych.so %{buildroot}%{_libdir}/gems/%{name}/psych-%{psych_version}/ mv %{buildroot}%{gem_dir}/specifications/default/psych-%{psych_version}.gemspec %{buildroot}%{gem_dir}/specifications -# The links should replace directory, which RPM cannot handle and it is causing -# issues during upgrade from F18 to F19. As a workaround the links are placed -# into vendor direcories. This could be changed back as soon as F18 is EOLed. -# https://bugzilla.redhat.com/show_bug.cgi?id=988490 -ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych %{buildroot}%{ruby_vendorlibdir}/psych -ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych.rb %{buildroot}%{ruby_vendorlibdir}/psych.rb -ln -s %{_libdir}/gems/%{name}/psych-%{psych_version}/psych.so %{buildroot}%{ruby_vendorarchdir}/psych.so +ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych %{buildroot}%{ruby_libdir}/psych +ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych.rb %{buildroot}%{ruby_libdir}/psych.rb +ln -s %{_libdir}/gems/%{name}/psych-%{psych_version}/lib/psych.so %{buildroot}%{ruby_libarchdir}/psych.so # Adjust the gemspec files so that the gems will load properly sed -i '/^end$/ i\ @@ -652,6 +648,7 @@ make check TESTS="-v $DISABLE_TESTS" %exclude %{ruby_libdir}/irb.rb %exclude %{ruby_libdir}/tcltk.rb %exclude %{ruby_libdir}/tk*.rb +%exclude %{ruby_libdir}/psych.rb %{ruby_libdir}/cgi %{ruby_libdir}/digest %{ruby_libdir}/drb @@ -862,9 +859,9 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/power_assert-%{power_assert_version}.gemspec %files -n rubygem-psych -%{ruby_vendorlibdir}/psych -%{ruby_vendorlibdir}/psych.rb -%{ruby_vendorarchdir}/psych.so +%{ruby_libdir}/psych +%{ruby_libdir}/psych.rb +%{ruby_libarchdir}/psych.so %{_libdir}/gems/%{name}/psych-%{psych_version} %{gem_dir}/gems/psych-%{psych_version} %{gem_dir}/specifications/psych-%{psych_version}.gemspec From 7097d0fbcca1807eddd12112d1244a2def61dbbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 19 Dec 2014 15:10:53 +0100 Subject: [PATCH 23/27] Upgrade to Ruby 2.2.0 (rc1). --- ruby-2.2.0-Extend-weak-ref-test-timeout.patch | 13 +++++++ ...ubyoptions.rb-TestRubyOptions-test_v.patch | 36 +++++++++++++++++++ ruby.spec | 16 ++++++--- 3 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 ruby-2.2.0-Extend-weak-ref-test-timeout.patch create mode 100644 ruby-2.2.0-test-ruby-test_rubyoptions.rb-TestRubyOptions-test_v.patch diff --git a/ruby-2.2.0-Extend-weak-ref-test-timeout.patch b/ruby-2.2.0-Extend-weak-ref-test-timeout.patch new file mode 100644 index 0000000..746f5e4 --- /dev/null +++ b/ruby-2.2.0-Extend-weak-ref-test-timeout.patch @@ -0,0 +1,13 @@ +diff --git a/test/test_weakref.rb b/test/test_weakref.rb +index 36b5d5b..861457f 100644 +--- a/test/test_weakref.rb ++++ b/test/test_weakref.rb +@@ -63,7 +63,7 @@ class TestWeakRef < Test::Unit::TestCase + + def test_repeated_object_leak + bug10537 = '[ruby-core:66428]' +- assert_no_memory_leak(%w(-rweakref), '', <<-'end;', bug10537) ++ assert_no_memory_leak(%w(-rweakref), '', <<-'end;', bug10537, timeout: 30) + a = Object.new + 150_000.times { WeakRef.new(a) } + end; diff --git a/ruby-2.2.0-test-ruby-test_rubyoptions.rb-TestRubyOptions-test_v.patch b/ruby-2.2.0-test-ruby-test_rubyoptions.rb-TestRubyOptions-test_v.patch new file mode 100644 index 0000000..1abb323 --- /dev/null +++ b/ruby-2.2.0-test-ruby-test_rubyoptions.rb-TestRubyOptions-test_v.patch @@ -0,0 +1,36 @@ +From a7fe780482b42b31c725f6c54bb1c27909714ab3 Mon Sep 17 00:00:00 2001 +From: usa +Date: Fri, 19 Dec 2014 02:52:17 +0000 +Subject: [PATCH] * test/ruby/test_rubyoptions.rb + (TestRubyOptions#test_version): should support rc :-P + +git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e +--- + test/ruby/test_rubyoptions.rb | 4 +- + 1 file changed, 2 insertion(+), 2 deletion(-) + +diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb +index 9150806..2bd1a30 100644 +--- a/test/ruby/test_rubyoptions.rb ++++ b/test/ruby/test_rubyoptions.rb +@@ -85,7 +85,7 @@ class TestRubyOptions < Test::Unit::TestCase + + def test_verbose + assert_in_out_err(["-vve", ""]) do |r, e| +- assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev).*? \[#{RUBY_PLATFORM}\]$/, r.join) ++ assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev|rc).*? \[#{RUBY_PLATFORM}\]$/, r.join) + assert_equal RUBY_DESCRIPTION, r.join.chomp + assert_equal([], e) + end +@@ -139,7 +139,7 @@ class TestRubyOptions < Test::Unit::TestCase + + def test_version + assert_in_out_err(%w(--version)) do |r, e| +- assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev).*? \[#{RUBY_PLATFORM}\]$/, r.join) ++ assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev|rc).*? \[#{RUBY_PLATFORM}\]$/, r.join) + assert_equal RUBY_DESCRIPTION, r.join.chomp + assert_equal([], e) + end +-- +2.1.0 + diff --git a/ruby.spec b/ruby.spec index 254a523..5ce372b 100644 --- a/ruby.spec +++ b/ruby.spec @@ -7,7 +7,7 @@ %global ruby_release %{ruby_version} # Specify the named version. It has precedense to revision. -#%%global milestone preview2 +%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. %global revision 48879 @@ -64,7 +64,7 @@ Group: Development/Languages # Public Domain for example for: include/ruby/st.h, strftime.c, ... License: (Ruby or BSD) and Public Domain URL: http://ruby-lang.org/ -Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{major_minor_version}/%{ruby_archive}.tar.bz2 +Source0: ftp://ftp.ruby-lang.org/pub/%{name}/%{major_minor_version}/%{ruby_archive}.tar.xz Source1: operating_system.rb # TODO: Try to push SystemTap support upstream. Source2: libruby.stp @@ -107,6 +107,12 @@ Patch5: ruby-1.9.3-mkmf-verbose.patch # in support for ABRT. # http://bugs.ruby-lang.org/issues/8566 Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +# Fix TestRubyOptions#test_version failure for RC1. +# https://github.com/ruby/ruby/commit/a7fe780482b42b31c725f6c54bb1c27909714ab3 +Patch7: ruby-2.2.0-test-ruby-test_rubyoptions.rb-TestRubyOptions-test_v.patch +# Fix TestWeakRef#test_repeated_object_leak failure on ARM. +# https://bugs.ruby-lang.org/issues/10618 +Patch8: ruby-2.2.0-Extend-weak-ref-test-timeout.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: ruby(rubygems) >= %{rubygems_version} @@ -401,6 +407,8 @@ rm -rf ext/psych/yaml %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -880,8 +888,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.1.r48879 -- Upgrade to Ruby 2.2.0 (r48879). +* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.1.rc1 +- Upgrade to Ruby 2.2.0 (rc1). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. - Drop libdb dependency in favor of gdbm. From a9419c8c4b76f572e30d540877e9f9c2a4fd4469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 23 Dec 2014 14:41:48 +0100 Subject: [PATCH 24/27] Upgrade to Ruby 2.2.0 (r48899). --- ...ubyoptions.rb-TestRubyOptions-test_v.patch | 36 ------------------- ruby.spec | 14 +++----- 2 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 ruby-2.2.0-test-ruby-test_rubyoptions.rb-TestRubyOptions-test_v.patch diff --git a/ruby-2.2.0-test-ruby-test_rubyoptions.rb-TestRubyOptions-test_v.patch b/ruby-2.2.0-test-ruby-test_rubyoptions.rb-TestRubyOptions-test_v.patch deleted file mode 100644 index 1abb323..0000000 --- a/ruby-2.2.0-test-ruby-test_rubyoptions.rb-TestRubyOptions-test_v.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a7fe780482b42b31c725f6c54bb1c27909714ab3 Mon Sep 17 00:00:00 2001 -From: usa -Date: Fri, 19 Dec 2014 02:52:17 +0000 -Subject: [PATCH] * test/ruby/test_rubyoptions.rb - (TestRubyOptions#test_version): should support rc :-P - -git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e ---- - test/ruby/test_rubyoptions.rb | 4 +- - 1 file changed, 2 insertion(+), 2 deletion(-) - -diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb -index 9150806..2bd1a30 100644 ---- a/test/ruby/test_rubyoptions.rb -+++ b/test/ruby/test_rubyoptions.rb -@@ -85,7 +85,7 @@ class TestRubyOptions < Test::Unit::TestCase - - def test_verbose - assert_in_out_err(["-vve", ""]) do |r, e| -- assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev).*? \[#{RUBY_PLATFORM}\]$/, r.join) -+ assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev|rc).*? \[#{RUBY_PLATFORM}\]$/, r.join) - assert_equal RUBY_DESCRIPTION, r.join.chomp - assert_equal([], e) - end -@@ -139,7 +139,7 @@ class TestRubyOptions < Test::Unit::TestCase - - def test_version - assert_in_out_err(%w(--version)) do |r, e| -- assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev).*? \[#{RUBY_PLATFORM}\]$/, r.join) -+ assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev|rc).*? \[#{RUBY_PLATFORM}\]$/, r.join) - assert_equal RUBY_DESCRIPTION, r.join.chomp - assert_equal([], e) - end --- -2.1.0 - diff --git a/ruby.spec b/ruby.spec index 5ce372b..637c3ed 100644 --- a/ruby.spec +++ b/ruby.spec @@ -7,10 +7,10 @@ %global ruby_release %{ruby_version} # Specify the named version. It has precedense to revision. -%global milestone rc1 +#%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -%global revision 48879 +%global revision 48899 %global ruby_archive %{name}-%{ruby_version} @@ -34,7 +34,7 @@ # http://redmine.ruby-lang.org/issues/5313 %global irb_version %{ruby_version} -%global bigdecimal_version 1.2.5 +%global bigdecimal_version 1.2.6 %global io_console_version 0.4.3 %global json_version 1.8.1 %global minitest_version 5.4.3 @@ -107,9 +107,6 @@ Patch5: ruby-1.9.3-mkmf-verbose.patch # in support for ABRT. # http://bugs.ruby-lang.org/issues/8566 Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch -# Fix TestRubyOptions#test_version failure for RC1. -# https://github.com/ruby/ruby/commit/a7fe780482b42b31c725f6c54bb1c27909714ab3 -Patch7: ruby-2.2.0-test-ruby-test_rubyoptions.rb-TestRubyOptions-test_v.patch # Fix TestWeakRef#test_repeated_object_leak failure on ARM. # https://bugs.ruby-lang.org/issues/10618 Patch8: ruby-2.2.0-Extend-weak-ref-test-timeout.patch @@ -407,7 +404,6 @@ rm -rf ext/psych/yaml %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p1 %patch8 -p1 # Provide an example of usage of the tapset: @@ -888,8 +884,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.1.rc1 -- Upgrade to Ruby 2.2.0 (rc1). +* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.1.r48899 +- Upgrade to Ruby 2.2.0 (r48899). - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. - Drop libdb dependency in favor of gdbm. From 1bc3d3a4ec7a4873380c24974e79df9a29e1d872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 2 Jan 2015 16:35:22 +0100 Subject: [PATCH 25/27] Upgrade to Ruby 2.2.0. --- ...cify-additional-preludes-by-configuratio.patch | 2 +- ...2.1.0-Enable-configuration-of-archlibdir.patch | 2 +- ...icated-paths-when-empty-version-string-i.patch | 6 +++--- ruby-2.1.0-always-use-i386.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 4 ++-- ruby-2.2.0-Extend-weak-ref-test-timeout.patch | 13 ------------- ruby.spec | 15 +++++---------- 7 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 ruby-2.2.0-Extend-weak-ref-test-timeout.patch diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index d0e53c6..b30ad4f 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in index 0e371e2..d4f1dcb 100644 --- a/configure.in +++ b/configure.in -@@ -4156,6 +4156,13 @@ AC_SUBST(rubyarchhdrdir)dnl +@@ -4160,6 +4160,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 7370052..6863f07 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 37d9a62..553d4d0 100644 --- a/configure.in +++ b/configure.in -@@ -3378,6 +3378,11 @@ if test ${multiarch+set}; then +@@ -3379,6 +3379,11 @@ if test ${multiarch+set}; then fi archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index 73c16d4..570d4d7 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in index 17ed3ed..5843651 100644 --- a/configure.in +++ b/configure.in -@@ -3962,8 +3962,6 @@ AS_CASE(["$target_os"], +@@ -3966,8 +3966,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -23,7 +23,7 @@ index 17ed3ed..5843651 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, -@@ -3993,6 +3991,7 @@ AC_ARG_WITH(ruby-version, +@@ -3997,6 +3995,7 @@ AC_ARG_WITH(ruby-version, [ruby_version=full]) unset RUBY_LIB_VERSION unset RUBY_LIB_VERSION_STYLE @@ -31,7 +31,7 @@ index 17ed3ed..5843651 100644 AS_CASE(["$ruby_version"], [full], [RUBY_LIB_VERSION_STYLE='3 /* full */'], [minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */']) -@@ -4009,30 +4008,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then +@@ -4013,30 +4012,34 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`" eval $ruby_version elif test -z "${ruby_version}"; then diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index ad0a203..210adb1 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 553d4d0..03a4152 100644 --- a/configure.in +++ b/configure.in -@@ -4074,6 +4074,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4078,6 +4078,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index e467d3b..41de23f 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in index 03a4152..0e371e2 100644 --- a/configure.in +++ b/configure.in -@@ -4048,6 +4048,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4052,6 +4052,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644 if test "${LOAD_RELATIVE+set}"; then AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4071,6 +4075,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4075,6 +4079,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl diff --git a/ruby-2.2.0-Extend-weak-ref-test-timeout.patch b/ruby-2.2.0-Extend-weak-ref-test-timeout.patch deleted file mode 100644 index 746f5e4..0000000 --- a/ruby-2.2.0-Extend-weak-ref-test-timeout.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test/test_weakref.rb b/test/test_weakref.rb -index 36b5d5b..861457f 100644 ---- a/test/test_weakref.rb -+++ b/test/test_weakref.rb -@@ -63,7 +63,7 @@ class TestWeakRef < Test::Unit::TestCase - - def test_repeated_object_leak - bug10537 = '[ruby-core:66428]' -- assert_no_memory_leak(%w(-rweakref), '', <<-'end;', bug10537) -+ assert_no_memory_leak(%w(-rweakref), '', <<-'end;', bug10537, timeout: 30) - a = Object.new - 150_000.times { WeakRef.new(a) } - end; diff --git a/ruby.spec b/ruby.spec index 637c3ed..5335c98 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -%global revision 48899 +#%%global revision 48936 %global ruby_archive %{name}-%{ruby_version} @@ -107,9 +107,6 @@ Patch5: ruby-1.9.3-mkmf-verbose.patch # in support for ABRT. # http://bugs.ruby-lang.org/issues/8566 Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch -# Fix TestWeakRef#test_repeated_object_leak failure on ARM. -# https://bugs.ruby-lang.org/issues/10618 -Patch8: ruby-2.2.0-Extend-weak-ref-test-timeout.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: ruby(rubygems) >= %{rubygems_version} @@ -172,6 +169,8 @@ Group: Development/Libraries License: Ruby or MIT Requires: ruby(release) Requires: rubygem(rdoc) >= %{rdoc_version} +# TODO: This seems to be optional now. +# https://github.com/rubygems/rubygems/commit/68da16dd7508c5c4010bfe32f99422568d3d582f Requires: rubygem(io-console) >= %{io_console_version} Requires: rubygem(psych) >= %{psych_version} Provides: gem = %{version}-%{release} @@ -404,7 +403,6 @@ rm -rf ext/psych/yaml %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch8 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -440,9 +438,6 @@ autoconf # Avoid regeneration of prelude.c due to patch6 applied to common.mk. # https://bugs.ruby-lang.org/issues/10554 -# TODO: Alternative solution might be to remove the path6 entirely and go -# ahead with the following proposal: -# https://bugs.ruby-lang.org/issues/8566#note-3 touch prelude.c # Q= makes the build output more verbose and allows to check Fedora @@ -884,8 +879,8 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Mon Nov 10 2014 Vít Ondruch - 2.2.0-0.1.r48899 -- Upgrade to Ruby 2.2.0 (r48899). +* Fri Jan 02 2015 Vít Ondruch - 2.2.0-1 +- Upgrade to Ruby 2.2.0. - Explicitly list RubyGems directories to avoid accidentaly packaged content. - Split test-unit and power_assert gems into separate sub-packages. - Drop libdb dependency in favor of gdbm. From 5a6322e4fb1204f482dfe03ca66a58d42e680b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 2 Jan 2015 16:43:15 +0100 Subject: [PATCH 26/27] Fix RubyGems version. --- ruby.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index 5335c98..006ae2f 100644 --- a/ruby.spec +++ b/ruby.spec @@ -24,7 +24,7 @@ %global release 1 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} -%global rubygems_version 2.4.4 +%global rubygems_version 2.4.5 # The RubyGems library has to stay out of Ruby directory three, since the # RubyGems should be share by all Ruby implementations. From c70d1f6b886f2e56c1498dec1fb62a2cb45a66ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 5 Jan 2015 10:13:22 +0100 Subject: [PATCH 27/27] Fix psych.so symlink. --- ruby.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index 006ae2f..39a7620 100644 --- a/ruby.spec +++ b/ruby.spec @@ -538,7 +538,7 @@ mv %{buildroot}%{ruby_libarchdir}/psych.so %{buildroot}%{_libdir}/gems/%{name}/p mv %{buildroot}%{gem_dir}/specifications/default/psych-%{psych_version}.gemspec %{buildroot}%{gem_dir}/specifications ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych %{buildroot}%{ruby_libdir}/psych ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych.rb %{buildroot}%{ruby_libdir}/psych.rb -ln -s %{_libdir}/gems/%{name}/psych-%{psych_version}/lib/psych.so %{buildroot}%{ruby_libarchdir}/psych.so +ln -s %{_libdir}/gems/%{name}/psych-%{psych_version}/psych.so %{buildroot}%{ruby_libarchdir}/psych.so # Adjust the gemspec files so that the gems will load properly sed -i '/^end$/ i\