[packages/ruby/dev-2.0] fix ruby-doc-ri packaging

glen glen at pld-linux.org
Sun Jun 1 18:30:35 CEST 2014


commit df9a7ee8f55d6c2b8f275f8c3bc83f05c8597d44
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Jun 1 18:34:18 2014 +0300

    fix ruby-doc-ri packaging

 ruby.spec | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index 32b92e7..45cf012 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -19,7 +19,7 @@
 %bcond_without	default_ruby	# use this Ruby as default system Ruby
 %bcond_with	bootstrap	# build bootstrap version
 
-%define		rel		0.18
+%define		rel		0.19
 %define		ruby_version	2.0
 %define		basever		2.0.0
 %define		patchlevel	481
@@ -112,7 +112,7 @@ 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}
 
@@ -516,7 +516,7 @@ 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
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{oname}-%{basever}.%{patchlevel}
@@ -637,8 +637,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
@@ -664,8 +664,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}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/df9a7ee8f55d6c2b8f275f8c3bc83f05c8597d44



More information about the pld-cvs-commit mailing list