X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ruby.spec;h=cdfb2a2707615cd6ad7af51f1026847ee53f3181;hb=1b39e8e22a3dd0b855f903aac5744de6864ab6b1;hp=eca1f9d702425ceb0ae9e170e59dda81f4a1b6d0;hpb=293a48c2ac55fa1ffe9147af4a7943864d711a90;p=packages%2Fruby.git

diff --git a/ruby.spec b/ruby.spec
index eca1f9d..cdfb2a2 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,65 +1,81 @@
-#
 # TODO:
 #	- include ext/ in docs
 #	- 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)
-#   - custom-rubygems-location.patch
+# - 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_without	batteries	# Don't include rubygems, json or rake
+%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		ruby_version	1.9
-%define		basever		1.9.3
-%define		patchlevel	392
-%define		doc_version	1_9_3
-%define		json_ver	1.5.5
-%define		rake_ver	0.9.2.2
-%define		rubygems_ver	1.8.11
-%define		minitest_ver	2.5.1
-%define		rdoc_ver	3.9.5
+%define		rel		1
+%define		ruby_version	2.0
+%define		basever		2.0.0
+%define		patchlevel	643
+
+%define		ruby_suffix %{!?with_default_ruby:%{ruby_version}}
+%define		doc_version	2_0_0
+
+%define		bigdecimal_ver	1.2.0
+%define		io_console_ver	0.4.2
+%define		irb_ver		0.9.6
+%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インタプリタ
 Summary(pl.UTF-8):	Ruby - interpretowany język skryptowy
 Summary(pt_BR.UTF-8):	Linguagem de script orientada a objeto
 Summary(zh_CN.UTF-8):	ruby - 一种快速高效的面向对象脚本编程语言
-Name:		ruby
+Name:		ruby%{ruby_suffix}
 Version:	%{basever}.%{patchlevel}
-# NOTE: do not decrease Release, when updating Version,
-# unless rdoc_ver, rubygems_ver *both* are increased as well
-Release:	2
+Release:	%{rel}
 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/%{ruby_version}/%{name}-%{basever}-p%{patchlevel}.tar.bz2
-# Source0-md5:	a810d64e2255179d2f334eb61fb8519c
-Source1:	http://www.ruby-doc.org/download/%{name}-doc-bundle.tar.gz
+Source0:	https://ftp.ruby-lang.org/pub/ruby/2.0/%{oname}-%{basever}-p%{patchlevel}.tar.bz2
+# Source0-md5:	1390888cac6cd175e6f164eff378cdde
+Source1:	http://www.ruby-doc.org/download/%{oname}-doc-bundle.tar.gz
 # Source1-md5:	ad1af0043be98ba1a4f6d0185df63876
-Source2:	http://www.ruby-doc.org/downloads/%{name}_%{doc_version}_stdlib_rdocs.tgz
-# Source2-md5:	ec622612428672c432b6f65dd31a84b5
-Source3:	http://www.ruby-doc.org/downloads/%{name}_%{doc_version}_core_rdocs.tgz
-# Source3-md5:	1892aadde51d36106c513bced2193dff
-Source100:	ftp://ftp.ruby-lang.org/pub/ruby/1.8/%{name}-1.8.7-p330.tar.gz
+Source2:	http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_stdlib_rdocs.tgz
+# Source2-md5:	e93307804295a43512cafbf660a4cbe0
+Source3:	http://www.ruby-doc.org/downloads/%{oname}_%{doc_version}_core_rdocs.tgz
+# Source3-md5:	900186f317b51edfbb2f5317f8855719
+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
-Patch0:		%{name}-lib64.patch
-Patch1:		%{name}-ffs.patch
+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
+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
-BuildRequires:	bison
+BuildRequires:	bison >= 1.875
 BuildRequires:	db-devel
 BuildRequires:	gdbm-devel >= 1.8.3
 BuildRequires:	libffi-devel
@@ -67,7 +83,11 @@ BuildRequires:	ncurses-devel
 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:	yaml-devel
 %if %{with tk}
@@ -75,54 +95,45 @@ BuildRequires:	tk-devel
 %endif
 Requires(post,postun):	/sbin/ldconfig
 Provides:	ruby(ver) = %{ruby_version}
-Obsoletes:	rdoc
-Obsoletes:	ruby-REXML
+Obsoletes:	ruby-REXML <= 2.4.0-2
 Obsoletes:	ruby-doc < 1.8.4
-Obsoletes:	ruby-fastthread
-%if %{with batteries}
-Provides:	json = %{json_ver}
-Provides:	rake = %{rake_ver}
-Provides:	ruby-json = %{json_ver}
-Provides:	ruby-rake = %{rake_ver}
-Obsoletes:	ruby-json
-Obsoletes:	ruby-rake
-%endif
+Obsoletes:	ruby-fastthread <= 0.6.3
+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	gem_dir			%{_datadir}/%{name}/gems/%{ruby_version}
+%define	ruby_ridir		%{_datadir}/ri/system
+%define	gem_dir			%{_datadir}/gems
+%define	gem_libdir		%{_libdir}/gems/%{oname}
 
-# 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}/%{name}/%{ruby_version}
-%define	ruby_libdir		%{_datadir}/%{name}/%{ruby_version}
+%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.
 %define	sitedir			site_ruby
-%define	ruby_sitedir		%{_prefix}/local/share/%{name}/%{sitedir}
-%define	ruby_sitearchdir	%{_prefix}/local/%{_lib}/%{name}/%{sitedir}/%{ruby_version}
-%define	ruby_sitelibdir		%{_prefix}/local/share/%{name}/%{sitedir}/%{ruby_version}
+%define	ruby_sitearchdir	%{_prefix}/local/%{_lib}/%{oname}/%{sitedir}/%{ruby_version}
+%define	ruby_sitelibdir		%{_prefix}/local/share/%{oname}/%{sitedir}
 
 # This is the general location for libs/archs compatible with all
 # or most of the Ruby versions available in the PLD repositories.
 %define	vendordir		vendor_ruby
-%define	ruby_vendordir		%{_datadir}/%{name}/%{vendordir}
-%define	ruby_vendorarchdir	%{_libdir}/%{name}/%{vendordir}/%{ruby_version}
-%define	ruby_vendorlibdir	%{_datadir}/%{name}/%{vendordir}/%{ruby_version}
+%define	ruby_vendorarchdir	%{_libdir}/%{oname}/%{vendordir}/%{ruby_version}
+%define	ruby_vendorlibdir	%{_datadir}/%{oname}/%{vendordir}
 
 # TODO: drop legacy loadpaths after all ruby modules rebuilt in Th
-%define	legacy_libdir		%{_libdir}/%{name}/%{ruby_version}
-%define	legacy_archdir		%{_libdir}/%{name}/%{ruby_version}/%{_arch}-linux
-%define	legacy_sitedir		%{_libdir}/%{name}/%{sitedir}
-%define	legacy_sitelibdir	%{_libdir}/%{name}/%{sitedir}/%{ruby_version}
-%define	legacy_sitearchdir	%{_libdir}/%{name}/%{sitedir}/%{ruby_version}/%{_arch}-linux
-%define	legacy_vendordir	%{_libdir}/%{name}/%{vendordir}
-%define	legacy_vendorlibdir	%{_libdir}/%{name}/%{vendordir}/%{ruby_version}
-%define	legacy_vendorarchdir%{_libdir}/%{name}/%{vendordir}/%{ruby_version}/%{_arch}-linux
+%define	legacy_libdir		%{_libdir}/%{oname}/%{ruby_version}
+%define	legacy_archdir		%{_libdir}/%{oname}/%{ruby_version}/%{_target_cpu}-linux
+%define	legacy_sitedir		%{_libdir}/%{oname}/%{sitedir}
+%define	legacy_sitelibdir	%{_libdir}/%{oname}/%{sitedir}/%{ruby_version}
+%define	legacy_sitearchdir	%{_libdir}/%{oname}/%{sitedir}/%{ruby_version}/%{_target_cpu}-linux
+%define	legacy_vendordir	%{_libdir}/%{oname}/%{vendordir}
+%define	legacy_vendorlibdir	%{_libdir}/%{oname}/%{vendordir}/%{ruby_version}
+%define	legacy_vendorarchdir	%{_libdir}/%{oname}/%{vendordir}/%{ruby_version}/%{_target_cpu}-linux
 
 %define	legacy_siteloadpath	%{legacy_sitelibdir}\\0%{legacy_sitearchdir}\\0%{legacy_sitedir}
 %define	legacy_vendorloadpath	%{legacy_vendorarchdir}
@@ -172,21 +183,26 @@ Summary(pl.UTF-8):	Standardowe moduły i narzędzia dla języka Ruby
 Group:		Development/Languages
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Suggests:	ruby-rubygems
-# workaround for autodep generator not getting version properly
-Provides:	ruby(abi) = %{ruby_version}
+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}
-Obsoletes:	ruby-minitest
+%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
 
 %description modules
 Ruby standard modules and utilities:
 - erb - Tiny eRuby
-- irb - interactive Ruby
 - testrb - automatic runner for Test::Unit of Ruby
 
 %description modules -l pl.UTF-8
 Standardowe moduły i narzędzia Ruby:
 - erb - mały eRuby
-- irb - interaktywny Ruby
 - testrb - automatyczny runner dla Ruby Test::Unit
 
 %package tk
@@ -196,7 +212,7 @@ Group:		Development/Languages
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description tk
-This pachage contains Ruby/Tk bindings.
+This package contains Ruby/Tk bindings.
 
 %description tk -l pl.UTF-8
 Ten pakiet zawiera wiązania Ruby/Tk.
@@ -206,6 +222,9 @@ Summary:	Ruby development libraries
 Summary(pl.UTF-8):	Biblioteki programistyczne interpretera języka Ruby
 Group:		Development/Languages
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+Requires:	gcc
+Requires:	glibc-devel
+Requires:	pkgconfig
 
 %description devel
 Ruby development libraries.
@@ -229,6 +248,9 @@ Biblioteki statyczne Ruby.
 Summary:	Ruby HTML documentation
 Summary(pl.UTF-8):	Dokumentacja HTML do Ruby
 Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description doc
 Ruby HTML documentation: FAQ, guide, core and standard library.
@@ -242,6 +264,9 @@ Summary:	Ruby ri documentation
 Summary(pl.UTF-8):	Dokumentacja Ruby w formacie ri
 Group:		Documentation
 Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description doc-ri
 Ruby ri documentation.
@@ -253,6 +278,9 @@ Dokumentacja Ruby w formacie ri.
 Summary:	Ruby examples
 Summary(pl.UTF-8):	Przykłady dla języka Ruby
 Group:		Development/Languages
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description examples
 Ruby examples.
@@ -260,27 +288,64 @@ Ruby examples.
 %description examples -l pl.UTF-8
 Przykłady programów w języku Ruby.
 
-# IMPORTANT: keep this as last package, as we reset Epoch
+# IMPORTANT: keep irb, rdoc, rubygems, rake, json as last packages as we reset epoch/version/release
+# and %{version},%{release} macros may not be used directly as they take last
+# subpackage value not main package one what you intend to use
+
+%package irb
+Summary:	The Interactive Ruby
+Version:	%{irb_ver}
+Release:	%{basever}.%{patchlevel}.%{rel}
+Epoch:		0
+Group:		Development/Languages
+Requires:	%{name}-modules = 1:%{basever}.%{patchlevel}-%{rel}
+Provides:	irb = %{version}-%{release}
+Provides:	ruby(irb) = %{version}-%{release}
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description irb
+The irb is acronym for Interactive Ruby. It evaluates ruby expression
+from the terminal.
+
 %package rdoc
 Summary:	A tool to generate HTML and command-line documentation for Ruby projects
+Summary(pl.UTF-8):	Narzędzie do generowania dokumentacji HTML i linii poleceń dla projektów w Rubym
 Version:	%{rdoc_ver}
+Release:	%{basever}.%{patchlevel}.%{rel}
 Epoch:		0
 License:	GPL v2 and Ruby and MIT
 Group:		Development/Libraries
-Requires:	%{name}-modules = 1:%{basever}.%{patchlevel}-%{release}
+Requires:	%{name}-modules = 1:%{basever}.%{patchlevel}-%{rel}
+Requires:	%{name}-irb >= %{irb_ver}
+Requires:	%{name}-json >= %{json_ver}
+Obsoletes:	rdoc <= 0.9.0
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description rdoc
 RDoc produces HTML and command-line documentation for Ruby projects.
 RDoc includes the 'rdoc' and 'ri' tools for generating and displaying
 online documentation.
 
+%description rdoc -l pl.UTF-8
+RDoc tworzy dokumentację HTML i linii poleceń dla projektów w języku
+Ruby. RDoc zawiera narzędzia 'rdoc' i 'ri' do generowania i
+wyświetlania dokumentacji online.
+
 %package rubygems
-Summary:	The Ruby standard for packaging ruby libraries
+Summary:	RubyGems - the Ruby standard for packaging Ruby libraries
+Summary(pl.UTF-8):	RubyGems - standard Ruby'ego pakietowania bibliotek
 Version:	%{rubygems_ver}
+Release:	%{basever}.%{patchlevel}.%{rel}
+Epoch:		0
 License:	Ruby or MIT
 Group:		Development/Libraries
-Requires:	%{name}-modules = 1:%{basever}.%{patchlevel}-%{release}
+Requires:	%{name}-modules = 1:%{basever}.%{patchlevel}-%{rel}
 Requires:	%{name}-rdoc >= %{rdoc_ver}
+Suggests:	%{name}-devel
 Provides:	rubygems = %{rubygems_ver}
 %if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
@@ -290,11 +355,74 @@ BuildArch:	noarch
 RubyGems is the Ruby standard for publishing and managing third party
 libraries.
 
+%description rubygems -l pl.UTF-8
+RubyGems to standardowe narzędzie języka Ruby do publikowania i
+zarządzania zewnętrznymi bibliotekami.
+
+%package rake
+Summary:	Rake is a Make-like program implemented in Ruby
+Summary(pl.UTF-8):	Program typu Make dla języka Ruby
+Version:	%{rake_ver}
+Release:	%{basever}.%{patchlevel}.%{rel}
+Epoch:		0
+License:	MIT
+Group:		Development/Languages
+Provides:	rake = %{rake_ver}
+Conflicts:	ruby-modules < 1:1.9.3.429-2
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
+
+%description rake
+Rake is a simple Ruby build program with capabilities similar to make.
+
+It has the following features:
+- Rakefiles (rake's version of Makefiles) are completely defined in
+  standard Ruby syntax. No XML files to edit. No quirky Makefile syntax
+  to worry about (is that a tab or a space?)
+- Users can specify tasks with prerequisites.
+- Rake supports rule patterns to synthesize implicit tasks.
+- Rake is lightweight. It can be distributed with other projects as a
+  single file. Projects that depend upon rake do not require that rake
+  be installed on target systems.
+
+%description rake -l pl.UTF-8
+Rake to prosty program do budowania w języku Ruby o możliwościach
+podobnych do make.
+
+Ma następujące cechy:
+- Pliki Rakefile (rake'owa odmiana plików Makefile) są definiowane
+  całkowicie w standardowej składni języka Ruby. Nie trzeba modyfikować
+  plików XML. Nie trzeba martwić się kaprysami składni Makefile (czy to
+  tabulacja czy spacja?).
+- Użytkownicy mogą określać zadania z ich zależnościami.
+- Rake obsługuje wzorce reguł do tworzenia z nich wynikowych zadań.
+- Rake jest lekki. Może być rozpowszechniany z innymi projektami jako
+  pojedynczy plik. Projekty używające rake'a nie wymagają go
+  zainstalowanego na systemach docelowych.
+
+%package json
+Summary:	JSON library for Ruby
+Summary(pl.UTF-8):	Biblioteka JSON dla języka Ruby
+Version:	%{json_ver}
+Release:	%{basever}.%{patchlevel}.%{rel}
+Epoch:		0
+License:	MIT
+Group:		Development/Languages
+Obsoletes:	ruby-json-rubyforge
+Conflicts:	ruby-modules < 1:1.9.3.429-3
+
+%description json
+This is a JSON implementation as a Ruby extension in C.
+
+%description json -l pl.UTF-8
+Biblioteka JSON dla języka Ruby.
+
 %prep
 %if %{with bootstrap}
-%setup -q -n %{name}-%{basever}-p%{patchlevel} -a1 -a2 -a3 -a100
+%setup -q -n %{oname}-%{basever}-p%{patchlevel} -a1 -a2 -a3 -a100
 %else
-%setup -q -n %{name}-%{basever}-p%{patchlevel} -a1 -a2 -a3
+%setup -q -n %{oname}-%{basever}-p%{patchlevel} -a1 -a2 -a3
 %endif
 %patch0 -p1
 %patch1 -p1
@@ -302,22 +430,45 @@ libraries.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -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
+	echo "Set %%define rubygems_ver to $rubygems_ver and re-run."
+	exit 1
+fi
+rdoc_ver=$(awk '/VERSION =/ && $1 == "VERSION" {print $3}' lib/rdoc.rb | xargs)
+if [ $rdoc_ver != %{rdoc_ver} ]; then
+	echo "Set %%define rdoc_ver to $rdoc_ver and re-run."
+	exit 1
+fi
+
 cp -f /usr/share/automake/config.sub .
 
 # build ruby-1.8.7 first
 %if %{with bootstrap}
-cd %{name}-1.8.7-p330
+cd %{oname}-1.8.7-p330
 %configure
 %{__make}
 cd ..
@@ -325,23 +476,29 @@ cd ..
 
 %{__autoconf}
 %configure \
-	%{?with_bootstrap:--with-baseruby=%{name}-1.8.7-p330/miniruby} \
-	--with-rubylibprefix=%(dirname %{ruby_libdir}) \
-	--with-archdir=%{ruby_archdir} \
-	--with-sitedir=%(dirname %{ruby_sitelibdir}) \
+	%{?with_bootstrap:--with-baseruby=%{oname}-1.8.7-p330/miniruby} \
+	--program-suffix=%{ruby_suffix} \
+	--with-rubygemsdir=%{rubygems_dir} \
+	--with-rubylibprefix=%{ruby_libdir} \
+	--with-rubyarchprefix=%{ruby_archdir} \
+	--with-sitedir=%{ruby_sitelibdir} \
 	--with-sitearchdir=%{ruby_sitearchdir} \
-	--with-vendordir=%(dirname %{ruby_vendorlibdir}) \
+	--with-vendordir=%{ruby_vendorlibdir} \
 	--with-vendorarchdir=%{ruby_vendorarchdir} \
-	--with-rubygemsdir=%{rubygems_dir} \
-	--with-search-path="%{legacy_loadpaths}" \
+	--with-rubyhdrdir=%{_includedir}/%{oname}-%{ruby_version} \
+	--with-rubyarchhdrdir=%{_includedir}/%{oname}-%{ruby_version} \
+	--with-sitearchhdrdir='$(sitehdrdir)/$(arch)' \
+	--with-vendorarchhdrdir='$(vendorhdrdir)/$(arch)' \
 	--enable-shared \
 	--enable-pthread \
+	--enable-multiarch \
+	--disable-rubygems \
 	--disable-install-doc \
-	--with-ruby-version=minor
+	--with-ruby-version=''
 
 %{__make} -j1 main \
 	COPY="cp -p" Q= \
-	%{?with_bootstrap:BASERUBY="ruby-1.8.7-p330/miniruby -I./ruby-1.8.7-p330/lib"}
+	%{?with_bootstrap:BASERUBY="%{oname}-1.8.7-p330/miniruby -I./ruby-1.8.7-p330/lib"}
 
 %if %{with doc}
 %{__make} -j1 rdoc
@@ -349,27 +506,132 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_rdocdir},%{_examplesdir}/%{name}-%{version}} \
-	$RPM_BUILD_ROOT{%{ruby_vendorarchdir},%{ruby_ridir}} \
-	$RPM_BUILD_ROOT{%{legacy_archdir},%{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_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
 
-cp -Rf sample/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man1
+# 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
+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!
+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}
+mv $RPM_BUILD_ROOT${gem_dir}/{gems,specifications} $RPM_BUILD_ROOT%{gem_dir}
+
+# Move bundled rubygems to %gem_dir
+# make symlinks for io-console and bigdecimal, which are considered to be part of stdlib by other Gems
+# make symlinks for all packages, so they would work without rubygems
+# 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 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}
+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
+
+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
+ln -s %{gem_dir}/gems/rdoc-%{rdoc_ver}/lib/rdoc $RPM_BUILD_ROOT%{ruby_libdir}
+ln -s %{gem_dir}/gems/rdoc-%{rdoc_ver}/lib/rdoc.rb $RPM_BUILD_ROOT%{ruby_libdir}
+mv $RPM_BUILD_ROOT%{gem_dir}/specifications/default/rdoc-%{rdoc_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
+
+install -d $RPM_BUILD_ROOT%{gem_dir}/gems/bigdecimal-%{bigdecimal_ver}/lib
+install -d $RPM_BUILD_ROOT%{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib
+mv $RPM_BUILD_ROOT%{ruby_libdir}/bigdecimal $RPM_BUILD_ROOT%{gem_dir}/gems/bigdecimal-%{bigdecimal_ver}/lib
+mv $RPM_BUILD_ROOT%{ruby_libarchdir}/bigdecimal.so $RPM_BUILD_ROOT%{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib
+mv $RPM_BUILD_ROOT%{gem_dir}/specifications/default/bigdecimal-%{bigdecimal_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
+ln -s %{gem_dir}/gems/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal $RPM_BUILD_ROOT%{ruby_libdir}/bigdecimal
+ln -s %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal.so $RPM_BUILD_ROOT%{ruby_libarchdir}/bigdecimal.so
+
+install -d $RPM_BUILD_ROOT%{gem_dir}/gems/io-console-%{io_console_ver}/lib
+install -d $RPM_BUILD_ROOT%{gem_libdir}/io-console-%{io_console_ver}/lib/io
+mv $RPM_BUILD_ROOT%{ruby_libdir}/io $RPM_BUILD_ROOT%{gem_dir}/gems/io-console-%{io_console_ver}/lib
+mv $RPM_BUILD_ROOT%{ruby_libarchdir}/io/console.so $RPM_BUILD_ROOT%{gem_libdir}/io-console-%{io_console_ver}/lib/io
+mv $RPM_BUILD_ROOT%{gem_dir}/specifications/default/io-console-%{io_console_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
+ln -s %{gem_dir}/gems/io-console-%{io_console_ver}/lib/io $RPM_BUILD_ROOT%{ruby_libdir}/io
+ln -s %{gem_libdir}/io-console-%{io_console_ver}/lib/io/console.so $RPM_BUILD_ROOT%{ruby_libarchdir}/io/console.so
+
+install -d $RPM_BUILD_ROOT%{gem_dir}/gems/json-%{json_ver}/lib
+install -d $RPM_BUILD_ROOT%{gem_libdir}/json-%{json_ver}/lib
+mv $RPM_BUILD_ROOT%{ruby_libdir}/json* $RPM_BUILD_ROOT%{gem_dir}/gems/json-%{json_ver}/lib
+mv $RPM_BUILD_ROOT%{ruby_libarchdir}/json $RPM_BUILD_ROOT%{gem_libdir}/json-%{json_ver}/lib
+mv $RPM_BUILD_ROOT%{gem_dir}/specifications/default/json-%{json_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
+ln -s %{gem_dir}/gems/json-%{json_ver}/lib/json $RPM_BUILD_ROOT%{ruby_libdir}/json
+ln -s %{gem_dir}/gems/json-%{json_ver}/lib/json.rb $RPM_BUILD_ROOT%{ruby_libdir}/json.rb
+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
+mv $RPM_BUILD_ROOT%{ruby_libdir}/psych* $RPM_BUILD_ROOT%{gem_dir}/gems/psych-%{psych_ver}/lib
+mv $RPM_BUILD_ROOT%{ruby_libarchdir}/psych.so $RPM_BUILD_ROOT%{gem_libdir}/psych-%{psych_ver}/lib/
+mv $RPM_BUILD_ROOT%{gem_dir}/specifications/default/psych-%{psych_ver}.gemspec $RPM_BUILD_ROOT%{gem_dir}/specifications
+ln -s %{gem_dir}/gems/psych-%{psych_ver}/lib/psych $RPM_BUILD_ROOT%{ruby_libdir}/psych
+ln -s %{gem_dir}/gems/psych-%{psych_ver}/lib/psych.rb $RPM_BUILD_ROOT%{ruby_libdir}/psych.rb
+ln -s %{gem_libdir}/psych-%{psych_ver}/lib/psych.so $RPM_BUILD_ROOT%{ruby_archdir}/psych.so
+
+# Adjust the gemspec files so that the gems will load properly
+sed -i '/^end$/ i\
+  s.require_paths = ["lib"]' $RPM_BUILD_ROOT%{gem_dir}/specifications/rake-%{rake_ver}.gemspec
+
+sed -i '/^end$/ i\
+  s.require_paths = ["lib"]' $RPM_BUILD_ROOT%{gem_dir}/specifications/rdoc-%{rdoc_ver}.gemspec
+
+sed -i '/^end$/ i\
+  s.require_paths = ["lib"]\
+  s.extensions = ["bigdecimal.so"]' $RPM_BUILD_ROOT%{gem_dir}/specifications/bigdecimal-%{bigdecimal_ver}.gemspec
+
+sed -i '/^end$/ i\
+  s.require_paths = ["lib"]\
+  s.extensions = ["io/console.so"]' $RPM_BUILD_ROOT%{gem_dir}/specifications/io-console-%{io_console_ver}.gemspec
+
+sed -i '/^end$/ i\
+  s.require_paths = ["lib"]\
+  s.extensions = ["json/ext/parser.so", "json/ext/generator.so"]' $RPM_BUILD_ROOT%{gem_dir}/specifications/json-%{json_ver}.gemspec
+
+sed -i '/^end$/ i\
+  s.require_paths = ["lib"]' $RPM_BUILD_ROOT%{gem_dir}/specifications/minitest-%{minitest_ver}.gemspec
+
+ln -sf %{gem_dir}/gems/rake-%{rake_ver}/bin/rake $RPM_BUILD_ROOT%{_bindir}/rake%{ruby_suffix}
+
 %if %{without batteries}
 # packaged separately
-%{__rm} -r $RPM_BUILD_ROOT%{ruby_libdir}/{rubygems,rake,json}
+%{__rm} -r $RPM_BUILD_ROOT%{ruby_libdir}/{rubygems,rake,json,minitest}
 %{__rm} -r $RPM_BUILD_ROOT%{ruby_archdir}/json
+%{__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} -r $RPM_BUILD_ROOT%{_datadir}/ri/%{ruby_version}/system/JSON
+%{__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
 
 %if %{with doc}
@@ -386,34 +648,30 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS LEGAL README README.EXT ChangeLog ToDo
-%attr(755,root,root) %{_bindir}/ruby
-%if %{with batteries}
-%attr(755,root,root) %{_bindir}/rake
-%endif
+%doc NEWS LEGAL README 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.1.9
-%{_mandir}/man1/ruby.1*
-%if %{with batteries}
-%{_mandir}/man1/rake.1*
-%endif
+%attr(755,root,root) %ghost %{_libdir}/libruby.so.%{ruby_version}
+%{_mandir}/man1/ruby%{ruby_suffix}.1*
 
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/%{vendordir}
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/%{vendordir}
+%dir %{_libdir}/%{oname}
+%dir %{_libdir}/%{oname}/%{vendordir}
+%dir %{_datadir}/%{oname}
 
 %dir %{ruby_libdir}
 %dir %{ruby_archdir}
 %dir %{ruby_vendorlibdir}
 %dir %{ruby_vendorarchdir}
 
-%dir %{_datadir}/ri
-%dir %{_datadir}/ri/%{ruby_version}
+%dir %{dirname:%{ruby_ridir}}
 %dir %{ruby_ridir}
-
 %dir %{ruby_rdocdir}
 
+# common dirs for ruby vendor modules
+%dir %{ruby_vendorlibdir}/data
+%dir %{ruby_vendorlibdir}/net
+
+%if 0
 # legacy dirs. when everything rebuilt in Th not using these dirs. drop them
 %dir %{legacy_archdir}
 %dir %{legacy_sitedir}
@@ -421,12 +679,15 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{legacy_sitearchdir}
 %dir %{legacy_vendorarchdir}
 %dir %{legacy_libdir}/tasks
+%dir %{legacy_archdir}/racc
+%endif
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libruby.so
-%{_includedir}/%{name}-%{ruby_version}
-%{_pkgconfigdir}/ruby-%{ruby_version}.pc
+%{_includedir}/%{oname}-%{ruby_version}
+%{_pkgconfigdir}/%{oname}-%{ruby_version}.pc
+%{ruby_libdir}/mkmf.rb
 
 %files static
 %defattr(644,root,root,755)
@@ -442,13 +703,21 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{ruby_archdir}/t*.so
 %endif
 
+%files irb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/irb%{ruby_suffix}
+%{ruby_libdir}/irb.rb
+%{ruby_libdir}/irb
+%{_mandir}/man1/irb%{ruby_suffix}.1*
+
 %files rdoc
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/rdoc
-%attr(755,root,root) %{_bindir}/ri
-%{_mandir}/man1/rdoc.1*
+%attr(755,root,root) %{_bindir}/rdoc%{ruby_suffix}
+%attr(755,root,root) %{_bindir}/ri%{ruby_suffix}
+%{_mandir}/man1/rdoc%{ruby_suffix}.1*
 %{ruby_libdir}/rdoc
 %dir %{gem_dir}/gems/rdoc-%{rdoc_ver}
+%{gem_dir}/gems/rdoc-%{rdoc_ver}/lib
 %dir %{gem_dir}/gems/rdoc-%{rdoc_ver}/bin
 %attr(755,root,root) %{gem_dir}/gems/rdoc-%{rdoc_ver}/bin/rdoc
 %{gem_dir}/specifications/rdoc-%{rdoc_ver}.gemspec
@@ -457,29 +726,45 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with batteries}
 %files rubygems
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gem
-%{ruby_libdir}/rubygems
-%{ruby_libdir}/rubygems.rb
-%{ruby_libdir}/ubygems.rb
+%attr(755,root,root) %{_bindir}/gem%{ruby_suffix}
+%{rubygems_dir}/rubygems
+%{rubygems_dir}/rubygems.rb
+%{rubygems_dir}/ubygems.rb
+%{rubygems_dir}/rbconfig
 
-%{gem_dir}/specifications/io-console-*.gemspec
-%{gem_dir}/specifications/bigdecimal-*.gemspec
-%if %{with batteries}
+%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
 %dir %{gem_dir}/gems/rake-%{rake_ver}
+%{gem_dir}/gems/rake-%{rake_ver}/lib
 %dir %{gem_dir}/gems/rake-%{rake_ver}/bin
 %attr(755,root,root) %{gem_dir}/gems/rake-%{rake_ver}/bin/rake
-%{gem_dir}/specifications/minitest-%{minitest_ver}.gemspec
 %{gem_dir}/specifications/rake-%{rake_ver}.gemspec
+
+%files json
+%defattr(644,root,root,755)
+%{ruby_libdir}/json
+%dir %{ruby_archdir}/json
+%dir %{ruby_archdir}/json/ext
+%attr(755,root,root) %{ruby_archdir}/json/ext/*.so
+
+%dir %{gem_libdir}/json-%{json_ver}
+%dir %{gem_libdir}/json-%{json_ver}/lib
+%dir %{gem_libdir}/json-%{json_ver}/lib/json
+%dir %{gem_libdir}/json-%{json_ver}/lib/json/ext
+%attr(755,root,root) %{gem_libdir}/json-%{json_ver}/lib/json/ext/generator.so
+%attr(755,root,root) %{gem_libdir}/json-%{json_ver}/lib/json/ext/parser.so
+
+%{gem_dir}/gems/json-%{json_ver}
 %{gem_dir}/specifications/json-%{json_ver}.gemspec
 %endif
-%endif
 
 %files modules
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/erb
-%attr(755,root,root) %{_bindir}/irb
-%attr(755,root,root) %{_bindir}/testrb
-%{ruby_libdir}/bigdecimal
+%attr(755,root,root) %{_bindir}/erb%{ruby_suffix}
 %{ruby_libdir}/cgi
 %{ruby_libdir}/date
 %{ruby_libdir}/digest
@@ -487,17 +772,10 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/drb
 %{ruby_libdir}/fiddle
 %{ruby_libdir}/io
-%{ruby_libdir}/irb
 %{ruby_libdir}/matrix
-%{ruby_libdir}/minitest
 %{ruby_libdir}/net
 %{ruby_libdir}/openssl
 %{ruby_libdir}/optparse
-%if %{with batteries}
-%{ruby_libdir}/json
-%{ruby_libdir}/rake
-%endif
-%{ruby_libdir}/psych
 %{ruby_libdir}/racc
 %{ruby_libdir}/rbconfig
 %{ruby_libdir}/rexml
@@ -505,13 +783,73 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_libdir}/ripper
 %{ruby_libdir}/rss
 %{ruby_libdir}/shell
-%{ruby_libdir}/syck
+#%{ruby_libdir}/syck
+%{ruby_libdir}/syslog
 %{ruby_libdir}/test
 %{ruby_libdir}/uri
 %{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
@@ -520,11 +858,52 @@ 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
-%attr(755,root,root) %{ruby_archdir}/[a-s]*.so
-%attr(755,root,root) %{ruby_archdir}/[u-z]*.so
+%exclude %{ruby_libdir}/rbconfig/datadir.rb
+%exclude %{ruby_libdir}/rbconfig/obsolete.rb
+%endif
+%exclude %{ruby_libdir}/irb.rb
+%exclude %{ruby_libdir}/mkmf.rb
+%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
@@ -535,28 +914,59 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{ruby_archdir}/enc/trans/*.so
 %dir %{ruby_archdir}/io
 %attr(755,root,root) %{ruby_archdir}/io/*.so
-%if %{with batteries}
-%dir %{ruby_archdir}/json
-%dir %{ruby_archdir}/json/ext
-%attr(755,root,root) %{ruby_archdir}/json/ext/*.so
-%endif
 %dir %{ruby_archdir}/mathn
 %attr(755,root,root) %{ruby_archdir}/mathn/*.so
 %dir %{ruby_archdir}/racc
 %attr(755,root,root) %{ruby_archdir}/racc/*.so
-%{ruby_archdir}/rbconfig.rb
 
-# parents of gem_dir
-%dir %{_datadir}/%{name}/gems
-#%dir %{_datadir}/%{name}/gems/%{ruby_version}
-%dir %{_datadir}/%{name}/gems/%{ruby_version}/gems
+# bigdecimal
+%{gem_dir}/specifications/bigdecimal-%{bigdecimal_ver}.gemspec
+%{gem_dir}/gems/bigdecimal-%{bigdecimal_ver}
+%dir %{gem_libdir}/bigdecimal-%{bigdecimal_ver}
+%dir %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib
+%attr(755,root,root) %{gem_libdir}/bigdecimal-%{bigdecimal_ver}/lib/bigdecimal.so
+%{ruby_libdir}/bigdecimal
+
+%dir %{_libdir}/gems
+%dir %{_libdir}/gems/%{oname}
+
+# io-console
+%{gem_dir}/specifications/io-console-%{io_console_ver}.gemspec
+%{gem_dir}/gems/io-console-%{io_console_ver}
+%dir %{gem_libdir}/io-console-%{io_console_ver}
+%dir %{gem_libdir}/io-console-%{io_console_ver}/lib
+%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
+%dir %{gem_libdir}/psych-%{psych_ver}
+%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
-%{_mandir}/man1/erb.1*
-%{_mandir}/man1/irb.1*
-%{_mandir}/man1/ri.1*
-%{_mandir}/man1/testrb.1*
+%dir %{gem_dir}/specifications/default
+%{_mandir}/man1/erb%{ruby_suffix}.1*
+%{_mandir}/man1/ri%{ruby_suffix}.1*
 
 %files doc
 %defattr(644,root,root,755)
@@ -572,4 +982,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files examples
 %defattr(644,root,root,755)
-%{_examplesdir}/%{name}-%{version}
+%{_examplesdir}/%{oname}-*