X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ruby.spec;h=aa3c48b0cfa737f28fc134b50607b31030f082dd;hb=refs%2Fheads%2Fv2.0.x;hp=3aa0d668fe6c22a9826d2ea7b02008f95a2b3911;hpb=a6d548c5454092ccc8589a0eb8b7902a0a581122;p=packages%2Fruby.git

diff --git a/ruby.spec b/ruby.spec
index 3aa0d66..aa3c48b 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -3,26 +3,23 @@
 #	- replace ri with fastri
 #	- patch ri to search multiple indexes (one per package), so RPMs can install ri docs
 #   - fix inconsistencies with versioned vs not-versioned dirs (see dirname hacks in configure)
-# - fix requires/provides 'ruby(abi) = '
-# - nil this macro: %ruby_mod_ver_requires_eq "Requires: ruby-modules(ver) = "
-# - fix tk build
-# - %ruby_version is empty and rpm error then
-# - vendor packages get installed to /usr/share/ruby/vendor_ruby/PACKAGE, which
-#   will be installed fine on ruby < 2.0, but not usable as path not in include
-#   path, how to force vendor packages built with ruby 2.0 pull ruby 2.0?
+# - vendor *noarch* packages get installed to /usr/share/ruby/vendor_ruby/PACKAGE, which
+#   will be installed fine on ruby < 2.0, but not usable as dir not in included
+#   in load_path, how to force vendor packages built with ruby 2.0 pull ruby 2.0?
 #   for packages with gem deps it's simple: ruby-listen-2.7.1-0.2.noarch marks ruby-modules-2.0.0.451-0.17.x86_64 (cap /usr/share/gems/specifications)
+#   add that dir to legacy loadpath?
 #
 # Conditional build:
 %bcond_without	doc		# skip (time-consuming) docs generating; intended for speed up test builds
-%bcond_without	tk		# skip building package with Tk bindings
+%bcond_with	tk		# build Tk bindings (tcl8.6 is not supported)
 %bcond_without	batteries	# Don't include rubygems, json, rake, minitest
 %bcond_without	default_ruby	# use this Ruby as default system Ruby
 %bcond_with	bootstrap	# build bootstrap version
 
-%define		rel		0.18
+%define		rel		3
 %define		ruby_version	2.0
 %define		basever		2.0.0
-%define		patchlevel	481
+%define		patchlevel	648
 
 %define		ruby_suffix %{!?with_default_ruby:%{ruby_version}}
 %define		doc_version	2_0_0
@@ -35,7 +32,7 @@
 %define		psych_ver	2.0.0
 %define		rake_ver	0.9.6
 %define		rdoc_ver	4.0.0
-%define		rubygems_ver	2.0.14
+%define		rubygems_ver	2.0.14.1
 %define		test_unit_ver	2.0.0.0
 
 %define		oname	ruby
@@ -51,8 +48,9 @@ Epoch:		1
 # Public Domain for example for: include/ruby/st.h, strftime.c, ...
 License:	(Ruby or BSD) and Public Domain
 Group:		Development/Languages
-Source0:	ftp://ftp.ruby-lang.org/pub/ruby/2.0/%{oname}-%{basever}-p%{patchlevel}.tar.bz2
-# Source0-md5:	ea406a8d415a1a5d8365596d4288f3da
+# https://www.ruby-lang.org/en/downloads/
+Source0:	https://ftp.ruby-lang.org/pub/ruby/2.0/%{oname}-%{basever}-p%{patchlevel}.tar.bz2
+# Source0-md5:	3544031334f4665aa2eb1414babc9345
 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
@@ -67,20 +65,14 @@ Source6:	operating_system.rb
 Patch0:		%{oname}-lib64.patch
 Patch1:		%{oname}-ffs.patch
 Patch2:		fix-bison-invocation.patch
-# http://redmine.ruby-lang.org/issues/5231
-#Patch3:		disable-versioned-paths.patch
-# TODO: Should be submitted upstream?
-#Patch4:		arch-specific-dir.patch
-# http://redmine.ruby-lang.org/issues/5281
-#Patch5:		site-and-vendor-arch-flags.patch
-# Make mkmf verbose by default
-Patch6:		mkmf-verbose.patch
-Patch7:		strip-ccache.patch
-Patch8:		duplicated-paths.patch
-Patch9:		DESTDIR.patch
-Patch10:	empty-ruby-version.patch
-Patch11:	rubygems-2.0.0-binary-extensions.patch
-Patch12:	custom-rubygems-location.patch
+Patch3:		mkmf-verbose.patch
+Patch4:		strip-ccache.patch
+Patch5:		duplicated-paths.patch
+Patch7:		empty-ruby-version.patch
+Patch8:		rubygems-2.0.0-binary-extensions.patch
+Patch9:		custom-rubygems-location.patch
+Patch10:	%{oname}-posixsh.patch
+Patch11:	x32-asm.patch
 URL:		http://www.ruby-lang.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -93,12 +85,16 @@ BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	readline-devel >= 4.2
 BuildRequires:	rpm-build >= 5.4.10-49
-# bootstrap needs ruby binary, erb module
-%{!?with_bootstrap:BuildRequires:	rpm-rubyprov}
-%{!?with_bootstrap:BuildRequires:	ruby-modules}
-%{!?with_bootstrap:BuildRequires:	ruby}
 BuildRequires:	sed >= 4.0
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 BuildRequires:	yaml-devel
+%if %{without bootstrap}
+# bootstrap needs ruby binary, erb module
+BuildRequires:	rpm-rubyprov
+BuildRequires:	ruby
+BuildRequires:	ruby-modules
+%endif
 %if %{with tk}
 BuildRequires:	tk-devel
 %endif
@@ -107,12 +103,12 @@ Provides:	ruby(ver) = %{ruby_version}
 Obsoletes:	ruby-REXML <= 2.4.0-2
 Obsoletes:	ruby-doc < 1.8.4
 Obsoletes:	ruby-fastthread <= 0.6.3
-Conflicts:	rpm-build-macros < 1.692
+Conflicts:	rpm-build-macros < 1.695
 Conflicts:	ruby-activesupport < 2.3.11-2
 Conflicts:	ruby-activesupport2 < 2.3.11-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define	ruby_ridir		%{_datadir}/ri/%{ruby_version}/system
+%define	ruby_ridir		%{_datadir}/ri/system
 %define	gem_dir			%{_datadir}/gems
 %define	gem_libdir		%{_libdir}/gems/%{oname}
 
@@ -202,6 +198,7 @@ Obsoletes:	ruby-minitest <= 1.5.0
 %endif
 # FIXME later
 Provides:	ruby(abi) = %{ruby_version}
+%requires_ge_to	openssl	openssl-devel
 
 %description modules
 Ruby standard modules and utilities:
@@ -325,6 +322,8 @@ Release:	%{basever}.%{patchlevel}.%{rel}
 Epoch:		0
 License:	GPL v2 and Ruby and MIT
 Group:		Development/Libraries
+Requires:	%{name}-irb >= %{irb_ver}
+Requires:	%{name}-json >= %{json_ver}
 Requires:	%{name}-modules = 1:%{basever}.%{patchlevel}-%{rel}
 Obsoletes:	rdoc <= 0.9.0
 %if "%{_rpmversion}" >= "5"
@@ -433,26 +432,31 @@ Biblioteka JSON dla języka Ruby.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
-#%patch5 -p1
-%patch6 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 
 # must be regenerated with new bison
 %{__rm} parse.{c,h}
 
+# Install custom operating_system.rb.
+install -d lib/rubygems/defaults
+cp -p %{SOURCE6} lib/rubygems/defaults
+
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
 find -type f '(' -name '*.rb' -o -name '*.cgi' -o -name '*.test' \
 	-o -name 'ruby.1' -o -name '*.html' -o -name '*.tcl' ')' \
 	| xargs %{__sed} -i 's,/usr/local/bin/,%{_bindir}/,'
 
+# no configure option to disable, so just rm
+%{!?with_tk:rm -rf ext/tk}
+
 %build
 rubygems_ver=$(awk '/VERSION =/ && $1 == "VERSION" {print $3}' lib/rubygems.rb | xargs)
 if [ $rubygems_ver != %{rubygems_ver} ]; then
@@ -512,9 +516,13 @@ install -d $RPM_BUILD_ROOT{%{ruby_rdocdir},%{ruby_ridir}} \
 	$RPM_BUILD_ROOT%{ruby_vendorlibdir}/net \
 	$RPM_BUILD_ROOT%{ruby_vendorlibdir}/data \
 
-%{__make} install %{?with_doc:install-doc} \
+%{__make} install %{?with_doc:install-doc -j1} \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# Version is empty if --with-ruby-version is specified.
+# http://bugs.ruby-lang.org/issues/7807
+sed -i -e 's/Version: \${ruby_version}/Version: %{ruby_version}/' $RPM_BUILD_ROOT%{_pkgconfigdir}/%{oname}-%{ruby_version}.pc
+
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{basever}.%{patchlevel}
 cp -Rf sample/* $RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{basever}.%{patchlevel}
 cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1/rdoc%{ruby_suffix}.1
@@ -523,8 +531,7 @@ cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1/testrb%{ruby_suffix}.1
 %{__rm} -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/html
 
 # detect this runtime, "make install" is affected by operating_system.rb what is installed in system!
-# TODO: use freshly built ruby&rubygems
-gem_dir=$(ruby -r rubygems -e 'puts Gem.default_dir')
+gem_dir=$(./miniruby -I. -Ilib -r rubygems -e 'puts Gem.default_dir')
 
 # Move gems root into common directory, out of Ruby directory structure.
 install -d $RPM_BUILD_ROOT%{gem_dir}
@@ -536,7 +543,7 @@ mv $RPM_BUILD_ROOT${gem_dir}/{gems,specifications} $RPM_BUILD_ROOT%{gem_dir}
 # NOTE: when making symlinks, do not symlink paths that could be directories,
 # 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 vendo dirs)
+# packages should go to vendor dirs)
 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}
@@ -618,10 +625,6 @@ sed -i '/^end$/ i\
 sed -i '/^end$/ i\
   s.require_paths = ["lib"]' $RPM_BUILD_ROOT%{gem_dir}/specifications/minitest-%{minitest_ver}.gemspec
 
-# Install custom operating_system.rb.
-install -d $RPM_BUILD_ROOT%{rubygems_dir}/rubygems/defaults
-cp -p %{SOURCE6} $RPM_BUILD_ROOT%{rubygems_dir}/rubygems/defaults
-
 ln -sf %{gem_dir}/gems/rake-%{rake_ver}/bin/rake $RPM_BUILD_ROOT%{_bindir}/rake%{ruby_suffix}
 
 %if %{without batteries}
@@ -638,8 +641,8 @@ ln -sf %{gem_dir}/gems/rake-%{rake_ver}/bin/rake $RPM_BUILD_ROOT%{_bindir}/rake%
 
 %if %{with doc}
 # too much .ri
-#%{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/cache.ri
-#%{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/created.rid
+%{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/cache.ri
+%{__rm} $RPM_BUILD_ROOT%{ruby_ridir}/created.rid
 %endif
 
 %clean
@@ -665,8 +668,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{ruby_vendorlibdir}
 %dir %{ruby_vendorarchdir}
 
-%dir %{_datadir}/ri
-%dir %{_datadir}/ri/%{ruby_version}
+%dir %{dirname:%{ruby_ridir}}
 %dir %{ruby_ridir}
 %dir %{ruby_rdocdir}
 
@@ -689,7 +691,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libruby.so
 %{_includedir}/%{oname}-%{ruby_version}
-%{_pkgconfigdir}/ruby-%{ruby_version}.pc
+%{_pkgconfigdir}/%{oname}-%{ruby_version}.pc
 %{ruby_libdir}/mkmf.rb
 
 %files static
@@ -730,7 +732,6 @@ rm -rf $RPM_BUILD_ROOT
 %files rubygems
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gem%{ruby_suffix}
-%dir %{rubygems_dir}
 %{rubygems_dir}/rubygems
 %{rubygems_dir}/rubygems.rb
 %{rubygems_dir}/ubygems.rb
@@ -741,6 +742,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/rake%{ruby_suffix}
 %{_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
 %dir %{gem_dir}/gems/rake-%{rake_ver}/bin
@@ -793,7 +795,66 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/webrick
 %{ruby_libdir}/xmlrpc
 %{ruby_libdir}/yaml
-%{ruby_libdir}/[A-Za-s]*.rb
+
+%{ruby_libdir}/English.rb
+%{ruby_libdir}/abbrev.rb
+%{ruby_libdir}/base64.rb
+%{ruby_libdir}/benchmark.rb
+%{ruby_libdir}/cgi.rb
+%{ruby_libdir}/cmath.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}/drb.rb
+%{ruby_libdir}/e2mmap.rb
+%{ruby_libdir}/erb.rb
+%{ruby_libdir}/expect.rb
+%{ruby_libdir}/fiddle.rb
+%{ruby_libdir}/fileutils.rb
+%{ruby_libdir}/find.rb
+%{ruby_libdir}/forwardable.rb
+%{ruby_libdir}/getoptlong.rb
+%{ruby_libdir}/gserver.rb
+%{ruby_libdir}/ipaddr.rb
+%{ruby_libdir}/json.rb
+%{ruby_libdir}/kconv.rb
+%{ruby_libdir}/logger.rb
+%{ruby_libdir}/mathn.rb
+%{ruby_libdir}/matrix.rb
+%{ruby_libdir}/monitor.rb
+%{ruby_libdir}/mutex_m.rb
+%{ruby_libdir}/observer.rb
+%{ruby_libdir}/open-uri.rb
+%{ruby_libdir}/open3.rb
+%{ruby_libdir}/openssl.rb
+%{ruby_libdir}/optparse.rb
+%{ruby_libdir}/ostruct.rb
+%{ruby_libdir}/pathname.rb
+%{ruby_libdir}/pp.rb
+%{ruby_libdir}/prettyprint.rb
+%{ruby_libdir}/prime.rb
+%{ruby_libdir}/profile.rb
+%{ruby_libdir}/profiler.rb
+%{ruby_libdir}/pstore.rb
+%{ruby_libdir}/psych.rb
+%{ruby_libdir}/rational.rb
+%{ruby_libdir}/rdoc.rb
+%{ruby_libdir}/resolv-replace.rb
+%{ruby_libdir}/resolv.rb
+%{ruby_libdir}/ripper.rb
+%{ruby_libdir}/rss.rb
+%{ruby_libdir}/scanf.rb
+%{ruby_libdir}/securerandom.rb
+%{ruby_libdir}/set.rb
+%{ruby_libdir}/shell.rb
+%{ruby_libdir}/shellwords.rb
+%{ruby_libdir}/singleton.rb
+%{ruby_libdir}/socket.rb
+%{ruby_libdir}/sync.rb
 %{ruby_libdir}/tempfile.rb
 %{ruby_libdir}/thread.rb
 %{ruby_libdir}/thwait.rb
@@ -802,7 +863,13 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/tmpdir.rb
 %{ruby_libdir}/tracer.rb
 %{ruby_libdir}/tsort.rb
-%{ruby_libdir}/[u-z]*.rb
+%{ruby_libdir}/un.rb
+%{ruby_libdir}/uri.rb
+%{ruby_libdir}/weakref.rb
+%{ruby_libdir}/webrick.rb
+%{ruby_libdir}/xmlrpc.rb
+%{ruby_libdir}/yaml.rb
+
 %if %{with batteries}
 %exclude %{ruby_libdir}/rubygems.rb
 %exclude %{ruby_libdir}/ubygems.rb
@@ -811,8 +878,37 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %exclude %{ruby_libdir}/irb.rb
 %exclude %{ruby_libdir}/mkmf.rb
-%attr(755,root,root) %{ruby_archdir}/[a-s]*.so
-%attr(755,root,root) %{ruby_archdir}/[u-z]*.so
+%exclude %{ruby_libdir}/rake.rb
+
+%{ruby_archdir}/rbconfig.rb
+%attr(755,root,root) %{ruby_archdir}/bigdecimal.so
+%attr(755,root,root) %{ruby_archdir}/continuation.so
+%attr(755,root,root) %{ruby_archdir}/coverage.so
+%attr(755,root,root) %{ruby_archdir}/curses.so
+%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}/etc.so
+%attr(755,root,root) %{ruby_archdir}/fcntl.so
+%attr(755,root,root) %{ruby_archdir}/fiber.so
+%attr(755,root,root) %{ruby_archdir}/fiddle.so
+%attr(755,root,root) %{ruby_archdir}/gdbm.so
+%attr(755,root,root) %{ruby_archdir}/nkf.so
+%attr(755,root,root) %{ruby_archdir}/objspace.so
+%attr(755,root,root) %{ruby_archdir}/openssl.so
+%attr(755,root,root) %{ruby_archdir}/pathname.so
+%attr(755,root,root) %{ruby_archdir}/psych.so
+%attr(755,root,root) %{ruby_archdir}/pty.so
+%attr(755,root,root) %{ruby_archdir}/readline.so
+%attr(755,root,root) %{ruby_archdir}/ripper.so
+%attr(755,root,root) %{ruby_archdir}/sdbm.so
+%attr(755,root,root) %{ruby_archdir}/socket.so
+%attr(755,root,root) %{ruby_archdir}/stringio.so
+%attr(755,root,root) %{ruby_archdir}/strscan.so
+%attr(755,root,root) %{ruby_archdir}/syslog.so
+%attr(755,root,root) %{ruby_archdir}/zlib.so
+
 %dir %{ruby_archdir}/digest
 %attr(755,root,root) %{ruby_archdir}/digest/*.so
 %dir %{ruby_archdir}/dl
@@ -827,7 +923,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{ruby_archdir}/mathn/*.so
 %dir %{ruby_archdir}/racc
 %attr(755,root,root) %{ruby_archdir}/racc/*.so
-%{ruby_archdir}/rbconfig.rb
 
 # bigdecimal
 %{gem_dir}/specifications/bigdecimal-%{bigdecimal_ver}.gemspec