[packages/ruby] rubygems_dir macro is path where rubygems is installed
glen
glen at pld-linux.org
Wed Mar 19 17:48:03 CET 2014
commit f493239c2b0a11b074c356341c943fd741f8376e
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Mar 19 18:39:49 2014 +0200
rubygems_dir macro is path where rubygems is installed
ruby.spec | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/ruby.spec b/ruby.spec
index aa84d87..f263e35 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -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 \
@@ -604,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)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ruby.git/commitdiff/f493239c2b0a11b074c356341c943fd741f8376e
More information about the pld-cvs-commit
mailing list