%bcond_with bootstrap # build bootstrap version
%bcond_with tests # build without tests
-%define rel 1
-%define ruby_version 2.1
-%define basever 2.1
-%define patchlevel 10
+# prevent some weird build error:
+# readlink: unrecognized option '--library=pthread'
+%define debug 1
+
+%define rel 0.1
+%define ruby_version 2.2
+%define basever 2.2
+%define patchlevel 5
%define pkg_version %{basever}.%{patchlevel}
%define ruby_suffix %{!?with_default_ruby:%{ruby_version}}
-%define doc_version 2_1_0
+%define doc_version 2_2_5
-%define bigdecimal_ver 1.2.4
+%define bigdecimal_ver 1.2.6
%define io_console_ver 0.4.3
%define irb_ver 0.9.6
%define json_ver 1.8.1
-%define minitest_ver 4.7.5
-%define psych_ver 2.0.5
-%define rake_ver 10.1.0
-%define rdoc_ver 4.1.0
-%define rubygems_ver 2.2.5
-%define test_unit_ver %{pkg_version}.0
+%define minitest_ver 5.4.3
+%define psych_ver 2.0.8
+%define rake_ver 10.4.2
+%define rdoc_ver 4.2.0
+%define rubygems_ver 2.4.5.1
+%define test_unit_ver 3.0.8
+%define power_assert_ver 0.2.2
%define oname ruby
Summary: Ruby - interpreted scripting language
Version: %{pkg_version}
Release: %{rel}
Epoch: 1
-# Public Domain for example for: include/ruby/st.h, strftime.c, ...
-License: (Ruby or BSD) and Public Domain
+# Public Domain for example for: include/ruby/st.h, strftime.c, missing/*, ...
+# MIT and CCO: ccan/*
+# zlib: ext/digest/md5/md5.*, ext/nkf/nkf-utf8/nkf.c
+# UCD: some of enc/trans/**/*.src
+License: (Ruby or BSD) and Public Domain and MIT and CC0 and zlib and UCD
Group: Development/Languages
# https://www.ruby-lang.org/en/downloads/
-Source0: https://ftp.ruby-lang.org/pub/ruby/2.1/%{oname}-%{pkg_version}.tar.xz
-# Source0-md5: 2d1eee7fcf152df41ed22665b02f1c3d
+Source0: https://ftp.ruby-lang.org/pub/ruby/2.2/%{oname}-%{pkg_version}.tar.xz
+# Source0-md5: 4b9506c37e908b5b17215b66b2760438
Source1: http://www.ruby-doc.org/download/%{oname}-doc-bundle.tar.gz
# Source1-md5: ad1af0043be98ba1a4f6d0185df63876
Source2: http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
-# Source2-md5: bf479c714ba189f9df633600b40aeef5
+# Source2-md5: ac3d547e5ea9ef5a89be161cd967a5e8
Source3: http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_core_rdocs.tgz
-# Source3-md5: 3515d672874a1e48d4a8fd32c50639e7
+# Source3-md5: 12f6b7a5e923fbae0f768d3cf760e88e
Source100: ftp://ftp.ruby-lang.org/pub/ruby/1.8/%{oname}-1.8.7-p330.tar.gz
# Source100-md5: 50a49edb787211598d08e756e733e42e
Source4: rdoc.1
Source5: testrb.1
Source6: operating_system.rb
Patch0: %{oname}-lib64.patch
-Patch1: %{oname}-ffs.patch
+#Patch1: %{oname}-ffs.patch
Patch2: fix-bison-invocation.patch
Patch3: mkmf-verbose.patch
Patch4: strip-ccache.patch
-Patch5: duplicated-paths.patch
+Patch5: ruby-version.patch
+Patch6: duplicated-paths.patch
# obsolete?
Patch8: rubygems-2.0.0-binary-extensions.patch
Patch9: custom-rubygems-location.patch
BuildRequires: ruby-modules
%endif
%if %{with tk}
-BuildRequires: tk-devel >= 8.4
BuildRequires: tk-devel < 8.7
+BuildRequires: tk-devel >= 8.4
%endif
Requires(post,postun): /sbin/ldconfig
Provides: ruby(ver) = %{ruby_version}
Provides: ruby-io-console = %{io_console_ver}
# ruby-modules deprecated, rpm5 generates ruby(abi) itself
Provides: ruby-modules(ver) = %{ruby_version}
-%if %{with batteries}
-Provides: ruby-minitest = %{minitest_ver}
-Obsoletes: ruby-minitest <= 1.5.0
-%endif
# FIXME later
Provides: ruby(abi) = %{ruby_version}
%requires_ge_to openssl openssl-devel
Version: %{rdoc_ver}
Release: %{pkg_version}.%{rel}
Epoch: 0
-License: GPL v2 and Ruby and MIT
+# SIL: lib/rdoc/generator/template/darkfish/css/fonts.css
+License: GPLv2 and Ruby and MIT and SIL
Group: Development/Libraries
Requires: %{name}-irb >= %{irb_ver}
Requires: %{name}-json >= %{json_ver}
Version: %{json_ver}
Release: %{pkg_version}.%{rel}
Epoch: 0
-License: MIT
+# UCD: ext/json/generator/generator.c
+License: (Ruby or GPLv2) and UCD
Group: Development/Languages
Obsoletes: ruby-json-rubyforge
Conflicts: ruby-modules < 1:1.9.3.429-3
%description json -l pl.UTF-8
Biblioteka JSON dla języka Ruby.
+%package minitest
+Summary: Minitest provides a complete suite of testing facilities
+Version: %{minitest_ver}
+Release: %{pkg_version}.%{rel}
+Epoch: 0
+License: MIT
+Group: Development/Libraries
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
+
+%description minitest
+minitest/unit is a small and incredibly fast unit testing framework.
+
+minitest/spec is a functionally complete spec engine.
+
+minitest/benchmark is an awesome way to assert the performance of your
+algorithms in a repeatable manner.
+
+minitest/mock by Steven Baker, is a beautifully tiny mock object
+framework.
+
+minitest/pride shows pride in testing and adds coloring to your test
+output.
+
+%package power_assert
+# The Summary/Description fields are rather poor.
+# https://github.com/k-tsj/power_assert/issues/3
+Summary: Power Assert for Ruby
+Version: %{power_assert_ver}
+Release: %{pkg_version}.%{rel}
+Epoch: 0
+License: Ruby or BSD
+Group: Development/Libraries
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
+
+%description power_assert
+Power Assert for Ruby.
+
+%package test-unit
+# The Summary/Description fields are rather poor.
+# https://github.com/test-unit/test-unit/issues/73
+Summary: Improved version of Test::Unit bundled in Ruby 1.8.x
+Version: %{test_unit_ver}
+Release: %{pkg_version}.%{rel}
+Epoch: 0
+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+)
+%if "%{_rpmversion}" >= "5"
+BuildArch: noarch
+%endif
+
+%description 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.
+
%prep
%setup -q -n %{oname}-%{pkg_version} -a1 -a2 -a3 %{?with_bootstrap:-a100}
%patch0 -p1
-%patch1 -p1
+#%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
+#%patch5 -p1
+%patch6 -p1
#%patch8 -p1
%patch9 -p1
%patch12 -p1
# must be regenerated with new bison
%{__rm} parse.{c,h}
+# Remove bundled libraries to be sure they are not used.
+%{__rm} -r ext/psych/yaml
+%{__rm} -r ext/fiddle/libffi*
+
# Install custom operating_system.rb.
install -d lib/rubygems/defaults
cp -p %{SOURCE6} lib/rubygems/defaults
DigiCertHighAssuranceEVRootCA.pem \
EntrustnetSecureServerCertificationAuthority.pem \
GeoTrustGlobalCA.pem \
+ AddTrustExternalCARoot.pem \
+ AddTrustExternalCARoot-2048.pem \
; do
%{__rm} $RPM_BUILD_ROOT%{rubygems_dir}/rubygems/ssl_certs/$cert
done
ln -s %{gem_libdir}/json-%{json_ver}/lib/json/ext/parser.so $RPM_BUILD_ROOT%{ruby_libarchdir}/json/ext
ln -s %{gem_libdir}/json-%{json_ver}/lib/json/ext/generator.so $RPM_BUILD_ROOT%{ruby_libarchdir}/json/ext
-install -d $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/lib
-%{__mv} $RPM_BUILD_ROOT%{ruby_libdir}/minitest $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/lib
+#install -d $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/lib
+#%{__mv} $RPM_BUILD_ROOT%{ruby_libdir}/minitest $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/lib
ln -s %{gem_dir}/gems/minitest-%{minitest_ver}/lib/minitest $RPM_BUILD_ROOT%{ruby_libdir}
-%{__mv} $RPM_BUILD_ROOT%{gem_dir}/specifications/default/minitest-%{minitest_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
+#%{__mv} $RPM_BUILD_ROOT%{gem_dir}/specifications/default/minitest-%{minitest_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
-install -d $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
+#install -d $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
install -d $RPM_BUILD_ROOT%{ruby_libdir}/test
-mv $RPM_BUILD_ROOT%{ruby_libdir}/test/unit $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
+#mv $RPM_BUILD_ROOT%{ruby_libdir}/test/unit $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
ln -s %{gem_dir}/gems/test-unit-%{test_unit_ver}/lib/unit $RPM_BUILD_ROOT%{ruby_libdir}/test
-mv $RPM_BUILD_ROOT%{gem_dir}/specifications/default/test-unit-%{test_unit_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
+#mv $RPM_BUILD_ROOT%{gem_dir}/specifications/default/test-unit-%{test_unit_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
install -d $RPM_BUILD_ROOT%{gem_dir}/gems/psych-%{psych_ver}/lib
install -d $RPM_BUILD_ROOT%{gem_libdir}/psych-%{psych_ver}/lib
sed -i '/^end$/ i\
s.require_paths = ["lib"]' $RPM_BUILD_ROOT%{gem_dir}/specifications/minitest-%{minitest_ver}.gemspec
+# Push the .gemspecs through the RubyGems to let them write the stub headers.
+# This speeds up loading of libraries and avoids warnings in Spring:
+# https://github.com/rubygems/rubygems/pull/694
+for s in rake-%{rake_ver}.gemspec rdoc-%{rdoc_ver}.gemspec json-%{json_ver}.gemspec; do
+ s="$RPM_BUILD_ROOT%{gem_dir}/specifications/$s"
+ %{__make} runruby TESTRUN_SCRIPT="-rubygems \
+ -e \"spec = Gem::Specification.load('$s')\" \
+ -e \"File.write '$s', spec.to_ruby\""
+done
+
ln -sf %{gem_dir}/gems/rake-%{rake_ver}/bin/rake $RPM_BUILD_ROOT%{_bindir}/rake%{ruby_suffix}
%{__sed} -i -e '1s,/usr/bin/env ruby,/usr/bin/ruby,' \
$RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/bin/rake \
$RPM_BUILD_ROOT%{gem_dir}/gems/rdoc-%{rdoc_ver}/bin/rdoc \
$RPM_BUILD_ROOT%{gem_dir}/gems/rdoc-%{rdoc_ver}/bin/ri \
- $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/bin/testrb \
$RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/{cal,test,time,uumerge}.rb \
$RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/{drb,logger,openssl,ripper,rss}/*.rb \
$RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/webrick/*.cgi
%files
%defattr(644,root,root,755)
-%doc NEWS LEGAL README README.EXT ChangeLog
+%doc NEWS LEGAL BSDL README.md README.EXT ChangeLog
%attr(755,root,root) %{_bindir}/ruby%{ruby_suffix}
%attr(755,root,root) %{_libdir}/libruby.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libruby.so.%{ruby_version}
%{gem_dir}/specifications/json-%{json_ver}.gemspec
%endif
+%files power_assert
+%defattr(644,root,root,755)
+%{gem_dir}/gems/power_assert-%{power_assert_ver}
+%exclude %{gem_dir}/gems/power_assert-%{power_assert_ver}/.*
+%{gem_dir}/specifications/power_assert-%{power_assert_ver}.gemspec
+
+%files minitest
+%defattr(644,root,root,755)
+%{ruby_libdir}/minitest
+%{gem_dir}/gems/minitest-%{minitest_ver}
+%exclude %{gem_dir}/gems/minitest-%{minitest_ver}/.*
+%{gem_dir}/specifications/minitest-%{minitest_ver}.gemspec
+
%files modules
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/erb%{ruby_suffix}
%{ruby_libdir}/cgi
-%{ruby_libdir}/date
+#%{ruby_libdir}/date
%{ruby_libdir}/digest
-%{ruby_libdir}/dl
+#%{ruby_libdir}/dl
%{ruby_libdir}/drb
%{ruby_libdir}/fiddle
%{ruby_libdir}/io
%{ruby_libdir}/benchmark.rb
%{ruby_libdir}/cgi.rb
%{ruby_libdir}/cmath.rb
-%{ruby_libdir}/complex.rb
+#%{ruby_libdir}/complex.rb
%{ruby_libdir}/csv.rb
%{ruby_libdir}/date.rb
%{ruby_libdir}/debug.rb
%{ruby_libdir}/delegate.rb
%{ruby_libdir}/digest.rb
-%{ruby_libdir}/dl.rb
+#%{ruby_libdir}/dl.rb
%{ruby_libdir}/drb.rb
%{ruby_libdir}/e2mmap.rb
%{ruby_libdir}/erb.rb
%{ruby_libdir}/find.rb
%{ruby_libdir}/forwardable.rb
%{ruby_libdir}/getoptlong.rb
-%{ruby_libdir}/gserver.rb
+#%{ruby_libdir}/gserver.rb
%{ruby_libdir}/ipaddr.rb
%{ruby_libdir}/json.rb
%{ruby_libdir}/kconv.rb
%{ruby_libdir}/profiler.rb
%{ruby_libdir}/pstore.rb
%{ruby_libdir}/psych.rb
-%{ruby_libdir}/rational.rb
+#%{ruby_libdir}/rational.rb
%{ruby_libdir}/rdoc.rb
%{ruby_libdir}/resolv-replace.rb
%{ruby_libdir}/resolv.rb
%exclude %{ruby_libdir}/rubygems.rb
%exclude %{ruby_libdir}/ubygems.rb
%exclude %{ruby_libdir}/rbconfig/datadir.rb
-%exclude %{ruby_libdir}/rbconfig/obsolete.rb
+#%exclude %{ruby_libdir}/rbconfig/obsolete.rb
%endif
%exclude %{ruby_libdir}/irb.rb
%exclude %{ruby_libdir}/mkmf.rb
%attr(755,root,root) %{ruby_archdir}/date_core.so
%attr(755,root,root) %{ruby_archdir}/dbm.so
%attr(755,root,root) %{ruby_archdir}/digest.so
-%attr(755,root,root) %{ruby_archdir}/dl.so
+#%attr(755,root,root) %{ruby_archdir}/dl.so
%attr(755,root,root) %{ruby_archdir}/etc.so
%attr(755,root,root) %{ruby_archdir}/fcntl.so
%attr(755,root,root) %{ruby_archdir}/fiber.so
%dir %{ruby_archdir}/digest
%attr(755,root,root) %{ruby_archdir}/digest/*.so
-%dir %{ruby_archdir}/dl
-%attr(755,root,root) %{ruby_archdir}/dl/callback.so
+#%dir %{ruby_archdir}/dl
+#%attr(755,root,root) %{ruby_archdir}/dl/callback.so
%dir %{ruby_archdir}/enc
%attr(755,root,root) %{ruby_archdir}/enc/*.so
%dir %{ruby_archdir}/enc/trans
%dir %{gem_libdir}/io-console-%{io_console_ver}/lib/io
%attr(755,root,root) %{gem_libdir}/io-console-%{io_console_ver}/lib/io/console.so
-%if %{with batteries}
-# minitest
-%{ruby_libdir}/minitest
-%{gem_dir}/gems/minitest-%{minitest_ver}
-%{gem_dir}/specifications/minitest-%{minitest_ver}.gemspec
-%endif
-
%{gem_dir}/specifications/psych-%{psych_ver}.gemspec
%{gem_dir}/gems/psych-%{psych_ver}
%{ruby_libdir}/psych
%{gem_dir}/specifications/test-unit-%{test_unit_ver}.gemspec
%dir %{gem_dir}/gems/test-unit-%{test_unit_ver}
%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
-%dir %{gem_dir}/gems/test-unit-%{test_unit_ver}/bin
-%attr(755,root,root) %{gem_dir}/gems/test-unit-%{test_unit_ver}/bin/testrb
-%attr(755,root,root) %{_bindir}/testrb%{ruby_suffix}
+#%dir %{gem_dir}/gems/test-unit-%{test_unit_ver}/bin
+#%attr(755,root,root) %{gem_dir}/gems/test-unit-%{test_unit_ver}/bin/testrb
+#%attr(755,root,root) %{_bindir}/testrb%{ruby_suffix}
%{_mandir}/man1/testrb%{ruby_suffix}.1*
%dir %{gem_dir}
projects / packages / ruby.git / blobdiff