Used ruby_vendorarchdir instead of ruby_sitearch
This commit is contained in:
parent
74ad81ffe0
commit
6abafcbfca
@ -18,7 +18,7 @@
|
|||||||
Summary: Round Robin Database Tool to store and display time-series data
|
Summary: Round Robin Database Tool to store and display time-series data
|
||||||
Name: rrdtool
|
Name: rrdtool
|
||||||
Version: 1.4.7
|
Version: 1.4.7
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
License: GPLv2+ with exceptions
|
License: GPLv2+ with exceptions
|
||||||
Group: Applications/Databases
|
Group: Applications/Databases
|
||||||
URL: http://oss.oetiker.ch/rrdtool/
|
URL: http://oss.oetiker.ch/rrdtool/
|
||||||
@ -131,7 +131,6 @@ The %{name}-tcl package includes RRDtool bindings for Tcl.
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with_ruby}
|
%if %{with_ruby}
|
||||||
%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
|
|
||||||
|
|
||||||
%package ruby
|
%package ruby
|
||||||
Summary: Ruby RRDtool bindings
|
Summary: Ruby RRDtool bindings
|
||||||
@ -213,6 +212,7 @@ cp -p /usr/lib/rpm/config.{guess,sub} php4/
|
|||||||
# Remove Rpath from Ruby
|
# Remove Rpath from Ruby
|
||||||
%{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,\$\(EPREFIX\)/lib||g' \
|
%{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,\$\(EPREFIX\)/lib||g' \
|
||||||
bindings/ruby/extconf.rb
|
bindings/ruby/extconf.rb
|
||||||
|
sed -i 's| extconf.rb| extconf.rb --vendor |' bindings/Makefile
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Force RRDp bits where we want 'em, not sure yet why the
|
# Force RRDp bits where we want 'em, not sure yet why the
|
||||||
@ -362,7 +362,7 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
|
|||||||
%files ruby
|
%files ruby
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc bindings/ruby/README
|
%doc bindings/ruby/README
|
||||||
%{ruby_sitearch}/RRD.so
|
%{ruby_vendorarchdir}/RRD.so
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %{with_lua}
|
%if %{with_lua}
|
||||||
@ -373,6 +373,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 8 2012 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.7-4
|
||||||
|
- Used ruby_vendorarchdir instead of ruby_sitearch
|
||||||
|
|
||||||
* Wed Feb 8 2012 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.7-3
|
* Wed Feb 8 2012 Jaroslav Škarvada <jskarvad@redhat.com> - 1.4.7-3
|
||||||
- Fixed ruby(abi) requires
|
- Fixed ruby(abi) requires
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user