disable default ruby (use ruby1.9 suffix)

[packages/ruby.git] / ruby.spec

diff --git a/ruby.spec b/ruby.spec
index 5da5092d9f0902e02ca73790f8e571ecf87c6443..7897bc49e2fbbfae976b630a1d9371cfcfe9268e 100644 (file)
--- a/ruby.spec
+++ b/ruby.spec
@@ -7,15 +7,15 @@
 #
 # 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              # skip building package with Tk bindings
 %bcond_without batteries       # Don't include rubygems, json, rake, minitest
-%bcond_without default_ruby    # use this Ruby as default system Ruby
+%bcond_with    default_ruby    # use this Ruby as default system Ruby
 %bcond_with    bootstrap       # build bootstrap version
 
-%define                rel             1
+%define                rel             3
 %define                ruby_version    1.9
 %define                basever         1.9.3
-%define                patchlevel      545
+%define                patchlevel      547
 
 %define                ruby_suffix %{!?with_default_ruby:%{ruby_version}}
 %define                doc_version     1_9_3
@@ -42,7 +42,7 @@ Epoch:                1
 License:       (Ruby or BSD) and Public Domain
 Group:         Development/Languages
 Source0:       ftp://ftp.ruby-lang.org/pub/ruby/1.9/%{oname}-%{basever}-p%{patchlevel}.tar.bz2
-# Source0-md5: 4743c1dc48491070bae8fc8b423bc1a7
+# Source0-md5: 5363d399be7f827c77bf8ae5d1a69b38
 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
@@ -98,9 +98,8 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define        ruby_ridir              %{_datadir}/ri/%{ruby_version}/system
 %define        gem_dir                 %{_datadir}/%{oname}/gems/%{ruby_version}
 
-# 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_libdir             %{_datadir}/%{oname}/%{ruby_version}
@@ -463,7 +462,6 @@ cd ..
        --with-sitearchdir=%{ruby_sitearchdir} \
        --with-vendordir=%(dirname %{ruby_vendorlibdir}) \
        --with-vendorarchdir=%{ruby_vendorarchdir} \
-       --with-rubygemsdir=%{rubygems_dir} \
        --with-search-path="%{legacy_loadpaths}" \
        --enable-shared \
        --enable-pthread \
@@ -481,8 +479,8 @@ cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_rdocdir},%{_examplesdir}/%{oname}-%{version}} \
-       $RPM_BUILD_ROOT{%{ruby_vendorarchdir},%{ruby_ridir}} \
+install -d $RPM_BUILD_ROOT{%{ruby_rdocdir},%{ruby_ridir}} \
+       $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} \
@@ -490,7 +488,8 @@ install -d $RPM_BUILD_ROOT{%{ruby_rdocdir},%{_examplesdir}/%{oname}-%{version}}
 %{__make} install %{?with_doc:install-doc} \
        DESTDIR=$RPM_BUILD_ROOT
 
-cp -Rf sample/* $RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{version}
+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
 
@@ -527,7 +526,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS LEGAL README README.EXT ChangeLog ToDo
 %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
+%attr(755,root,root) %ghost %{_libdir}/libruby.so.%{ruby_version}
 %{_mandir}/man1/ruby%{ruby_suffix}.1*
 
 %dir %{_libdir}/%{oname}
@@ -603,9 +602,9 @@ rm -rf $RPM_BUILD_ROOT
 %files rubygems
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gem%{ruby_suffix}
-%{ruby_libdir}/rubygems
-%{ruby_libdir}/rubygems.rb
-%{ruby_libdir}/ubygems.rb
+%{rubygems_dir}/rubygems
+%{rubygems_dir}/rubygems.rb
+%{rubygems_dir}/ubygems.rb
 
 %files rake
 %defattr(644,root,root,755)
@@ -724,4 +723,4 @@ rm -rf $RPM_BUILD_ROOT
 
 %files examples
 %defattr(644,root,root,755)
-%{_examplesdir}/%{oname}-%{version}
+%{_examplesdir}/%{oname}-*