X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ruby.spec;h=83f9a76f54505e73e963ea47e6051e47ff7fec5b;hb=88345633ccd2d0a1e6d79f26d58c32d2e95601f7;hp=9f0b42e50f0852549bd6c1f5c94c98270f82451b;hpb=3112d6a61a6fcf9953fe07b147adf8cc715ee08d;p=packages%2Fruby.git

diff --git a/ruby.spec b/ruby.spec
index 9f0b42e..83f9a76 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -13,28 +13,33 @@
 
 # prevent some weird build error:
 # readlink: unrecognized option '--library=pthread'
+# caused by:
+# $ chrpath -l /home/users/glen/tmp/ruby-2.3.3-root-glen/usr/lib64/ruby/2.3/enc/encdb.so
+# /home/users/glen/tmp/ruby-2.3.3-root-glen/usr/lib64/ruby/2.3/enc/encdb.so: RPATH=--library=pthread
 %define debug 1
 
 %define		rel		0.1
-%define		ruby_version	2.2
-%define		basever		2.2
-%define		patchlevel	5
+%define		ruby_version	2.3
+%define		basever		2.3
+%define		patchlevel	3
 %define		pkg_version	%{basever}.%{patchlevel}
 
 %define		ruby_suffix %{!?with_default_ruby:%{ruby_version}}
 %define		doc_version	2_2_5
 
-%define		bigdecimal_ver	1.2.6
-%define		io_console_ver	0.4.3
+%define		bigdecimal_ver	1.2.8
+%define		io_console_ver	0.4.5
 %define		irb_ver		0.9.6
-%define		json_ver	1.8.1
-%define		minitest_ver	5.4.3
-%define		psych_ver	2.0.8
+%define		json_ver	1.8.3
+%define		minitest_ver	5.8.5
+%define		psych_ver	2.1.0
 %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		rdoc_ver	4.2.1
+%define		rubygems_ver	2.5.2
+%define		test_unit_ver	3.1.5
+%define		power_assert_ver 0.2.6
+%define		did_you_mean_ver 1.0.0
+%define		net_telnet_ver	0.1.1
 
 %define		oname	ruby
 Summary:	Ruby - interpreted scripting language
@@ -54,7 +59,7 @@ 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.2/%{oname}-%{pkg_version}.tar.xz
-# Source0-md5:	4b9506c37e908b5b17215b66b2760438
+# Source0-md5:	0cba3d1b677d2695236ace62ca6d2255
 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
@@ -107,7 +112,6 @@ BuildRequires:	tk-devel < 8.7
 BuildRequires:	tk-devel >= 8.4
 %endif
 Requires(post,postun):	/sbin/ldconfig
-Provides:	ruby(ver) = %{ruby_version}
 Obsoletes:	ruby-REXML <= 2.4.0-2
 Obsoletes:	ruby-doc < 1.8.4
 Obsoletes:	ruby-fastthread <= 0.6.3
@@ -185,10 +189,6 @@ Provides:	ruby-bigdecimal = %{bigdecimal_ver}
 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
@@ -418,6 +418,31 @@ This is a JSON implementation as a Ruby extension in C.
 %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
@@ -432,7 +457,9 @@ BuildArch:	noarch
 %endif
 
 %description power_assert
-Power Assert for Ruby.
+Power Assert shows each value of variables and method calls in the
+expression. It is useful for testing, providing which value wasn't
+correct when the condition is not satisfied.
 
 %package test-unit
 # The Summary/Description fields are rather poor.
@@ -454,6 +481,42 @@ 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 did_you_mean
+Summary:	"Did you mean?" experience in Ruby
+Version:	%{did_you_mean_ver}
+Release:	%{pkg_version}.%{rel}
+Epoch:		0
+License:	MIT
+Group:		Development/Libraries
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description did_you_mean
+"did you mean?" experience in Ruby: the error message will tell you
+the right one when you misspelled something.
+
+%package net-telnet
+Summary:	Provides telnet client functionality
+Version:	%{net_telnet_ver}
+Release:	%{pkg_version}.%{rel}
+Epoch:		0
+Group:		Development/Libraries
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description net-telnet
+Provides telnet client functionality.
+
+This class also has, through delegation, all the methods of a socket
+object (by default, a TCPSocket, but can be set by the Proxy option to
+new()). This provides methods such as close() to end the session and
+sysread() to read data directly from the host, instead of via the
+waitfor() mechanism. Note that if you do use sysread() directly when
+in telnet mode, you should probably pass the output through
+preprocess() to extract telnet command sequences.
+
 %prep
 %setup -q -n %{oname}-%{pkg_version} -a1 -a2 -a3 %{?with_bootstrap:-a100}
 %patch0 -p1
@@ -461,7 +524,7 @@ improved actively.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-#%patch5 -p1
+%patch5 -p1
 %patch6 -p1
 #%patch8 -p1
 %patch9 -p1
@@ -526,7 +589,6 @@ cd ..
 	--with-sitearchhdrdir='$(sitehdrdir)/$(arch)' \
 	--with-vendorarchhdrdir='$(vendorhdrdir)/$(arch)' \
 	--enable-multiarch \
-	--enable-pthread \
 	--enable-shared \
 	--disable-install-doc \
 	--disable-rubygems \
@@ -630,11 +692,13 @@ install -d $RPM_BUILD_ROOT%{gem_dir}
 # as there may came files from other packages as well. actually, unlikely as
 # the links to got system dir and only ruby may package there (other distro
 # packages should go to vendor dirs)
+%if 0
 install -d $RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/lib
 %{__mv} $RPM_BUILD_ROOT%{ruby_libdir}/rake* $RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/lib
 ln -s %{gem_dir}/gems/rake-%{rake_ver}/lib/rake $RPM_BUILD_ROOT%{ruby_libdir}
 ln -s %{gem_dir}/gems/rake-%{rake_ver}/lib/rake.rb $RPM_BUILD_ROOT%{ruby_libdir}
 %{__mv} $RPM_BUILD_ROOT%{gem_dir}/specifications/default/rake-%{rake_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
+%endif
 
 install -d $RPM_BUILD_ROOT%{gem_dir}/gems/rdoc-%{rdoc_ver}/lib
 %{__mv} $RPM_BUILD_ROOT%{ruby_libdir}/rdoc* $RPM_BUILD_ROOT%{gem_dir}/gems/rdoc-%{rdoc_ver}/lib
@@ -669,16 +733,10 @@ install -d $RPM_BUILD_ROOT%{ruby_libarchdir}/json/ext
 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
 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
 
-#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
 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
 
 install -d $RPM_BUILD_ROOT%{gem_dir}/gems/psych-%{psych_ver}/lib
 install -d $RPM_BUILD_ROOT%{gem_libdir}/psych-%{psych_ver}/lib
@@ -732,6 +790,14 @@ ln -sf %{gem_dir}/gems/rake-%{rake_ver}/bin/rake $RPM_BUILD_ROOT%{_bindir}/rake%
 	$RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/{drb,logger,openssl,ripper,rss}/*.rb \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{pkg_version}/webrick/*.cgi
 
+# gem non library files
+%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/minitest-%{minitest_ver}/test
+%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/test-unit-%{test_unit_ver}/{[A-Z]*,doc,sample,test}
+%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/power_assert-%{power_assert_ver}/{[A-Z]*,test}
+%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/did_you_mean-%{did_you_mean_ver}/{[A-Z]*,doc,test}
+%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rake-%{rake_ver}/{[A-Z]*,doc,test}
+%{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/net-telnet-%{net_telnet_ver}/{[A-Z]*,bin}
+
 %if %{without batteries}
 # packaged separately
 %{__rm} -r $RPM_BUILD_ROOT%{ruby_libdir}/{rubygems,rake,json,minitest}
@@ -739,7 +805,7 @@ ln -sf %{gem_dir}/gems/rake-%{rake_ver}/bin/rake $RPM_BUILD_ROOT%{_bindir}/rake%
 %{__rm} -r $RPM_BUILD_ROOT%{gem_dir}/gems/rake-*
 %{__rm} $RPM_BUILD_ROOT%{ruby_libdir}/{rake,rubygems,json}.rb
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/{gem,rake}
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/rake*
+#%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/rake*
 %{__rm} $RPM_BUILD_ROOT%{gem_dir}/specifications/default/{json,minitest,rake}-*.gemspec
 %{?with_doc:%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/ri/%{ruby_version}/system/JSON}
 %endif
@@ -839,11 +905,12 @@ rm -rf $RPM_BUILD_ROOT
 %files rake
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rake%{ruby_suffix}
-%{_mandir}/man1/rake%{ruby_suffix}.1*
-%{ruby_libdir}/rake
-%{ruby_libdir}/rake.rb
+#%{_mandir}/man1/rake%{ruby_suffix}.1*
+#%{ruby_libdir}/rake
+#%{ruby_libdir}/rake.rb
 %dir %{gem_dir}/gems/rake-%{rake_ver}
 %{gem_dir}/gems/rake-%{rake_ver}/lib
+%{gem_dir}/gems/rake-%{rake_ver}/rakelib
 %dir %{gem_dir}/gems/rake-%{rake_ver}/bin
 %attr(755,root,root) %{gem_dir}/gems/rake-%{rake_ver}/bin/rake
 %{gem_dir}/specifications/rake-%{rake_ver}.gemspec
@@ -866,6 +933,39 @@ rm -rf $RPM_BUILD_ROOT
 %{gem_dir}/specifications/json-%{json_ver}.gemspec
 %endif
 
+%files power_assert
+%defattr(644,root,root,755)
+%dir %{gem_dir}/gems/power_assert-%{power_assert_ver}
+%{gem_dir}/gems/power_assert-%{power_assert_ver}/lib
+%{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}
+%{gem_dir}/specifications/minitest-%{minitest_ver}.gemspec
+
+%files test-unit
+%defattr(644,root,root,755)
+%dir %{gem_dir}/gems/test-unit-%{test_unit_ver}
+%{gem_dir}/gems/test-unit-%{test_unit_ver}/lib
+%{gem_dir}/specifications/test-unit-%{test_unit_ver}.gemspec
+%{_mandir}/man1/testrb%{ruby_suffix}.1*
+
+%files did_you_mean
+%defattr(644,root,root,755)
+%dir %{gem_dir}/gems/did_you_mean-%{did_you_mean_ver}
+%{gem_dir}/gems/did_you_mean-%{did_you_mean_ver}/benchmark
+%{gem_dir}/gems/did_you_mean-%{did_you_mean_ver}/evaluation
+%{gem_dir}/gems/did_you_mean-%{did_you_mean_ver}/lib
+%{gem_dir}/specifications/did_you_mean-%{did_you_mean_ver}.gemspec
+
+%files net-telnet
+%defattr(644,root,root,755)
+%dir %{gem_dir}/gems/net-telnet-%{net_telnet_ver}
+%{gem_dir}/gems/net-telnet-%{net_telnet_ver}/lib
+%{gem_dir}/specifications/net-telnet-%{net_telnet_ver}.gemspec
+
 %files modules
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/erb%{ruby_suffix}
@@ -929,6 +1029,7 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/open-uri.rb
 %{ruby_libdir}/open3.rb
 %{ruby_libdir}/openssl.rb
+%{ruby_libdir}/optionparser.rb
 %{ruby_libdir}/optparse.rb
 %{ruby_libdir}/ostruct.rb
 %{ruby_libdir}/pathname.rb
@@ -961,6 +1062,8 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/tracer.rb
 %{ruby_libdir}/tsort.rb
 %{ruby_libdir}/un.rb
+%{ruby_libdir}/unicode_normalize
+%{ruby_libdir}/unicode_normalize.rb
 %{ruby_libdir}/uri.rb
 %{ruby_libdir}/weakref.rb
 %{ruby_libdir}/webrick.rb
@@ -975,7 +1078,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %exclude %{ruby_libdir}/irb.rb
 %exclude %{ruby_libdir}/mkmf.rb
-%exclude %{ruby_libdir}/rake.rb
+#%exclude %{ruby_libdir}/rake.rb
 
 %{ruby_archdir}/rbconfig.rb
 %attr(755,root,root) %{ruby_archdir}/bigdecimal.so
@@ -1006,6 +1109,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{ruby_archdir}/syslog.so
 %attr(755,root,root) %{ruby_archdir}/zlib.so
 
+%dir %{ruby_archdir}/cgi
+%attr(755,root,root) %{ruby_archdir}/cgi/escape.so
 %dir %{ruby_archdir}/digest
 %attr(755,root,root) %{ruby_archdir}/digest/*.so
 #%dir %{ruby_archdir}/dl
@@ -1042,13 +1147,6 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -1056,15 +1154,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{gem_libdir}/psych-%{psych_ver}/lib
 %attr(755,root,root) %{gem_libdir}/psych-%{psych_ver}/lib/psych.so
 
-# test-unit
-%{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}
-%{_mandir}/man1/testrb%{ruby_suffix}.1*
-
 %dir %{gem_dir}
 %dir %{gem_dir}/gems
 %dir %{gem_dir}/specifications