From: Elan Ruusamäe <glen@delfi.ee>
Date: Wed, 19 Mar 2014 16:51:23 +0000 (+0200)
Subject: Merge branch 'master' into dev-2.0
X-Git-Tag: auto/th/ruby-2.0.0.481-1^2~24
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=184dcb98206934e4f36f804cf9f23246fdf624bc;p=packages%2Fruby.git

Merge branch 'master' into dev-2.0

Conflicts:
	ruby.spec
---

184dcb98206934e4f36f804cf9f23246fdf624bc
diff --cc ruby.spec
index c32ae87,f263e35..e9af072
--- a/ruby.spec
+++ b/ruby.spec
@@@ -11,26 -12,22 +11,25 @@@
  %bcond_without	default_ruby	# use this Ruby as default system Ruby
  %bcond_with	bootstrap	# build bootstrap version
  
 -%define		rel		1
 -%define		ruby_version	1.9
 -%define		basever		1.9.3
 -%define		patchlevel	545
 +%define		rel		0.2
 +%define		ruby_version	2.0
- %define		ver_suffix	20
 +%define		basever		2.0.0
 +%define		patchlevel	353
  
- %define		ruby_suffix %{!?with_default_ruby:%{ver_suffix}}
+ %define		ruby_suffix %{!?with_default_ruby:%{ruby_version}}
  %define		doc_version	1_9_3
 -%define		json_ver	1.5.5
 -%define		rake_ver	0.9.2.2
 -%define		rubygems_ver	1.8.23.2
 -%define		minitest_ver	2.5.1
 -# when increasing rdoc_ver, please remove "11." prefix in rdoc package release
 -%define		rdoc_ver	3.9.5
 +
 +%define		bigdecimal_ver	1.2.0
 +%define		io_console_ver	0.4.2
  %define		irb_ver		0.9.6
 -%define		bigdecimal_ver	1.1.0
 -%define		io_console_ver	0.3
 +%define		json_ver	1.7.7
 +%define		minitest_ver	4.3.2
 +%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		test_unit_ver	2.0.0.0
 +
  %define		oname	ruby
  Summary:	Ruby - interpreted scripting language
  Summary(ja.UTF-8):	オブジェクト指向言語Rubyインタプリタ
@@@ -104,16 -96,12 +103,15 @@@ Conflicts:	ruby-activesupport2 < 2.3.11
  BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
  
  %define	ruby_ridir		%{_datadir}/ri/%{ruby_version}/system
 -%define	gem_dir			%{_datadir}/%{oname}/gems/%{ruby_version}
 +#%define	gem_dir			%{_datadir}/gems
 +#%define	gem_dir			%{_datadir}/%{oname}/gems/%{ruby_version}
 +%define	gem_dir			%{_datadir}/%{oname}/%{ruby_version}/gems
  
- # The RubyGems library has to stay out of Ruby directory three, since the
- # RubyGems should be share by all Ruby implementations.
- %define	rubygems_dir		%{_datadir}/rubygems
+ # location where rubygems is installed
+ %define	rubygems_dir		%{ruby_libdir}
  
  %define	ruby_archdir		%{_libdir}/%{oname}/%{ruby_version}
 +%define	ruby_libarchdir		%{_libdir}/%{oname}/%{ruby_version}
  %define	ruby_libdir		%{_datadir}/%{oname}/%{ruby_version}
  
  # This is the local lib/arch and should not be used for packaging.
@@@ -502,15 -479,11 +500,10 @@@ cd .
  
  %install
  rm -rf $RPM_BUILD_ROOT
- install -d $RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{basever}.%{patchlevel} \
- 	$RPM_BUILD_ROOT%{ruby_ridir} \
- 
- #install -d $RPM_BUILD_ROOT{%{ruby_rdocdir},%{_examplesdir}/%{oname}-%{version}} \
- #	$RPM_BUILD_ROOT{%{ruby_vendorarchdir},%{ruby_ridir}} \
- #	$RPM_BUILD_ROOT%{ruby_vendorlibdir}/net \
- #	$RPM_BUILD_ROOT%{ruby_vendordir}/data \
- 
- #	$RPM_BUILD_ROOT{%{legacy_archdir}/racc,%{legacy_sitelibdir},%{legacy_sitearchdir},%{legacy_vendorarchdir},%{legacy_libdir}/tasks} \
+ install -d $RPM_BUILD_ROOT{%{ruby_rdocdir},%{ruby_ridir}} \
 -	$RPM_BUILD_ROOT{%{ruby_vendorarchdir} \
++	$RPM_BUILD_ROOT%{ruby_vendorarchdir} 
+ 	$RPM_BUILD_ROOT%{ruby_vendorlibdir}/net \
+ 	$RPM_BUILD_ROOT%{ruby_vendordir}/data \
 -	$RPM_BUILD_ROOT{%{legacy_archdir}/racc,%{legacy_sitelibdir},%{legacy_sitearchdir},%{legacy_vendorarchdir},%{legacy_libdir}/tasks} \
  
  %{__make} install %{?with_doc:install-doc} \
  	DESTDIR=$RPM_BUILD_ROOT
@@@ -570,13 -544,12 +564,13 @@@ rm -rf $RPM_BUILD_ROO
  %dir %{_datadir}/ri/%{ruby_version}
  %dir %{ruby_ridir}
  
 -%dir %{ruby_rdocdir}
 +#%dir %{ruby_rdocdir}
  
  # common dirs for ruby vendor modules
 -%dir %{ruby_vendorlibdir}/net
 +#%dir %{ruby_vendorlibdir}/net
  
- # legacy dirs. when everything rebuilt in Th not using these dirs. drop them
 +%if 0
+ # legacy dirs. when everything rebuilt in Th not using these dirs. drop them
  %dir %{legacy_archdir}
  %dir %{legacy_sitedir}
  %dir %{legacy_sitelibdir}