From f56e2b573de9a2b3e391483a97b87c10ea54feed Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 9 Apr 2012 19:01:33 +0200 Subject: [PATCH 1/6] disable check on ppc(64), RH bugzilla 803698 --- ruby.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ruby.spec b/ruby.spec index 47130c7..74282af 100644 --- a/ruby.spec +++ b/ruby.spec @@ -51,7 +51,7 @@ Summary: An interpreter of object-oriented scripting language Name: ruby Version: %{ruby_version_patch_level} -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: Ruby or BSD URL: http://ruby-lang.org/ @@ -429,7 +429,8 @@ sed -i '2 a\ # Disable make check on ARM until the bug is fixed # https://bugzilla.redhat.com/show_bug.cgi?id=789410 # https://bugs.ruby-lang.org/issues/6011 -%ifnarch %{arm} +# same for ppc(64), RH bugzilla #803698 +%ifnarch %{arm} ppc ppc64 # TODO: Investigate the test failures. # https://bugs.ruby-lang.org/issues/6036 make check TESTS="-v -x test_pathname.rb -x test_drbssl.rb -x test_parse.rb -x test_x509cert.rb" @@ -699,6 +700,9 @@ make check TESTS="-v -x test_pathname.rb -x test_drbssl.rb -x test_parse.rb -x t %{ruby_libdir}/tkextlib %changelog +* Mon Apr 09 2012 Karsten Hopp 1.9.3.125-3 +- disable check on ppc(64), RH bugzilla 803698 + * Wed Feb 29 2012 Peter Robinson - 1.9.3.125-2 - Temporarily disable make check on ARM until it's fixed upstream. Tracked in RHBZ 789410 From 82e6513e5e25926424ad145885596356e56f2566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 19 Apr 2012 10:03:22 +0200 Subject: [PATCH 2/6] Remove superfluous slashes. --- ruby.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ruby.spec b/ruby.spec index 74282af..b3805c2 100644 --- a/ruby.spec +++ b/ruby.spec @@ -405,25 +405,25 @@ mv %{buildroot}%{ruby_libdir}/minitest %{buildroot}%{gem_dir}/gems/minitest-%{mi # Adjust the gemspec files so that the gems will load properly sed -i '2 a\ - s.require_paths = ["lib"]' %{buildroot}/%{gem_dir}/specifications/rake-%{rake_version}.gemspec + s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/specifications/rake-%{rake_version}.gemspec sed -i '2 a\ - s.require_paths = ["lib"]' %{buildroot}/%{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec + s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/specifications/rdoc-%{rdoc_version}.gemspec sed -i '2 a\ s.require_paths = ["lib"]\ - s.extensions = ["bigdecimal.so"]' %{buildroot}/%{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec + s.extensions = ["bigdecimal.so"]' %{buildroot}%{gem_dir}/specifications/bigdecimal-%{bigdecimal_version}.gemspec sed -i '2 a\ s.require_paths = ["lib"]\ - s.extensions = ["io/console.so"]' %{buildroot}/%{gem_dir}/specifications/io-console-%{io_console_version}.gemspec + s.extensions = ["io/console.so"]' %{buildroot}%{gem_dir}/specifications/io-console-%{io_console_version}.gemspec sed -i '2 a\ s.require_paths = ["lib"]\ - s.extensions = ["json/ext/parser.so", "json/ext/generator.so"]' %{buildroot}/%{gem_dir}/specifications/json-%{json_version}.gemspec + s.extensions = ["json/ext/parser.so", "json/ext/generator.so"]' %{buildroot}%{gem_dir}/specifications/json-%{json_version}.gemspec sed -i '2 a\ - s.require_paths = ["lib"]' %{buildroot}/%{gem_dir}/specifications/minitest-%{minitest_version}.gemspec + s.require_paths = ["lib"]' %{buildroot}%{gem_dir}/specifications/minitest-%{minitest_version}.gemspec %check # Disable make check on ARM until the bug is fixed From 328c18e61ff2530cc24bc8b5455c062f013679c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 19 Apr 2012 10:36:30 +0200 Subject: [PATCH 3/6] Update test suite bug description and execution. --- ruby.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ruby.spec b/ruby.spec index b3805c2..a3ba8e8 100644 --- a/ruby.spec +++ b/ruby.spec @@ -431,9 +431,11 @@ sed -i '2 a\ # https://bugs.ruby-lang.org/issues/6011 # same for ppc(64), RH bugzilla #803698 %ifnarch %{arm} ppc ppc64 -# TODO: Investigate the test failures. -# https://bugs.ruby-lang.org/issues/6036 -make check TESTS="-v -x test_pathname.rb -x test_drbssl.rb -x test_parse.rb -x test_x509cert.rb" +# Test suite fails with OpenSSL 1.0.1 +# http://bugs.ruby-lang.org/issues/6089 +# OpenSSL 1.0.1 is breaking the drb test suite. +# https://bugs.ruby-lang.org/issues/6221 +make check TESTS="-v -x test_drbssl.rb -x test_x509cert.rb" %endif %post libs -p /sbin/ldconfig From 1cc853bb6008673ce9a094446f462daab3c98710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 20 Apr 2012 15:01:52 +0200 Subject: [PATCH 4/6] Update to Ruby 1.9.3-p194. --- .gitignore | 1 + ruby.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c58f574..08ebd24 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz /ruby-1.8.7-p357.tar.bz2 /ruby-1.9.3-p0.tar.gz /ruby-1.9.3-p125.tar.gz +/ruby-1.9.3-p194.tar.gz diff --git a/ruby.spec b/ruby.spec index a3ba8e8..0c1095e 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,7 +1,7 @@ %global major_version 1 %global minor_version 9 %global teeny_version 3 -%global patch_level 125 +%global patch_level 194 %global major_minor_version %{major_version}.%{minor_version} @@ -25,7 +25,7 @@ %global ruby_vendorlibdir %{_datadir}/ruby/%{ruby_vendordir} %global ruby_vendorarchdir %{_libdir}/ruby/%{ruby_vendordir} -%global rubygems_version 1.8.11 +%global rubygems_version 1.8.23 # The RubyGems library has to stay out of Ruby directory three, since the # RubyGems should be share by all Ruby implementations. @@ -51,7 +51,7 @@ Summary: An interpreter of object-oriented scripting language Name: ruby Version: %{ruby_version_patch_level} -Release: 3%{?dist} +Release: 1%{?dist} Group: Development/Languages License: Ruby or BSD URL: http://ruby-lang.org/ @@ -431,11 +431,9 @@ sed -i '2 a\ # https://bugs.ruby-lang.org/issues/6011 # same for ppc(64), RH bugzilla #803698 %ifnarch %{arm} ppc ppc64 -# Test suite fails with OpenSSL 1.0.1 -# http://bugs.ruby-lang.org/issues/6089 # OpenSSL 1.0.1 is breaking the drb test suite. # https://bugs.ruby-lang.org/issues/6221 -make check TESTS="-v -x test_drbssl.rb -x test_x509cert.rb" +make check TESTS="-v -x test_drbssl.rb" %endif %post libs -p /sbin/ldconfig @@ -702,6 +700,9 @@ make check TESTS="-v -x test_drbssl.rb -x test_x509cert.rb" %{ruby_libdir}/tkextlib %changelog +* Fri Apr 20 2012 Vít Ondruch - 1.9.3.194-1 +- Update to Ruby 1.9.3-p194. + * Mon Apr 09 2012 Karsten Hopp 1.9.3.125-3 - disable check on ppc(64), RH bugzilla 803698 diff --git a/sources b/sources index d168ab2..391168d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3ea86b9d3fc2d3ec867f66969ae3b92 ruby-1.9.3-p125.tar.gz +bc0c715c69da4d1d8bd57069c19f6c0e ruby-1.9.3-p194.tar.gz From cb8843b516ccf5335c70781378eaa8d05007e3f1 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 22 Apr 2012 16:19:25 +0900 Subject: [PATCH 5/6] Bump release --- ruby.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index 0c1095e..7dee288 100644 --- a/ruby.spec +++ b/ruby.spec @@ -51,7 +51,12 @@ Summary: An interpreter of object-oriented scripting language Name: ruby Version: %{ruby_version_patch_level} -Release: 1%{?dist} +# Note: +# As seen on perl srpm, as this (ruby) srpm contains several sub-components, +# we cannot reset the release number to 1 even when the main (ruby) version +# is updated - because it may be that the versions of sub-components don't +# change. +Release: 10.1%{?dist} Group: Development/Languages License: Ruby or BSD URL: http://ruby-lang.org/ @@ -700,6 +705,9 @@ make check TESTS="-v -x test_drbssl.rb" %{ruby_libdir}/tkextlib %changelog +* Sun Apr 22 2012 Mamoru Tasaka - 1.9.3.194-10.1 +- Bump release + * Fri Apr 20 2012 Vít Ondruch - 1.9.3.194-1 - Update to Ruby 1.9.3-p194. From 7156dc7e9b069776d417406659ed3fe70b337497 Mon Sep 17 00:00:00 2001 From: Bohuslav Kabrda Date: Wed, 30 May 2012 13:46:44 +0200 Subject: [PATCH 6/6] Fix license to contain Public Domain. - macros.ruby now contains unexpanded macros. --- ruby.spec | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/ruby.spec b/ruby.spec index 7dee288..a796390 100644 --- a/ruby.spec +++ b/ruby.spec @@ -56,9 +56,10 @@ Version: %{ruby_version_patch_level} # we cannot reset the release number to 1 even when the main (ruby) version # is updated - because it may be that the versions of sub-components don't # change. -Release: 10.1%{?dist} +Release: 11%{?dist} Group: Development/Languages -License: Ruby or BSD +# 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.gz Source1: operating_system.rb @@ -345,19 +346,19 @@ make install DESTDIR=%{buildroot} # Dump the macros into macro.ruby to use them to build other Ruby libraries. mkdir -p %{buildroot}%{_sysconfdir}/rpm cat >> %{buildroot}%{_sysconfdir}/rpm/macros.ruby << \EOF -%%ruby_libdir %{_datadir}/%{name} -%%ruby_libarchdir %{_libdir}/%{name} +%%ruby_libdir %%{_datadir}/%{name} +%%ruby_libarchdir %%{_libdir}/%{name} # This is the local lib/arch and should not be used for packaging. %%ruby_sitedir site_ruby -%%ruby_sitelibdir %{_prefix}/local/share/ruby/%{ruby_sitedir} -%%ruby_sitearchdir %{_prefix}/local/%{_lib}/ruby/%{ruby_sitedir} +%%ruby_sitelibdir %%{_prefix}/local/share/%{name}/%%{ruby_sitedir} +%%ruby_sitearchdir %%{_prefix}/local/%%{_lib}/%{name}/%%{ruby_sitedir} # This is the general location for libs/archs compatible with all # or most of the Ruby versions available in the Fedora repositories. %%ruby_vendordir vendor_ruby -%%ruby_vendorlibdir %{_datadir}/ruby/%{ruby_vendordir} -%%ruby_vendorarchdir %{_libdir}/ruby/%{ruby_vendordir} +%%ruby_vendorlibdir %%{ruby_libdir}/%%{ruby_vendordir} +%%ruby_vendorarchdir %%{ruby_libarchdir}/%%{ruby_vendordir} EOF cat >> %{buildroot}%{_sysconfdir}/rpm/macros.rubygems << \EOF @@ -705,6 +706,10 @@ make check TESTS="-v -x test_drbssl.rb" %{ruby_libdir}/tkextlib %changelog +* Tue May 29 2012 Bohuslav Kabrda - 1.9.3.194-11 +- Fix license to contain Public Domain. +- macros.ruby now contains unexpanded macros. + * Sun Apr 22 2012 Mamoru Tasaka - 1.9.3.194-10.1 - Bump release