From 6abafcbfca8945c4caf1f91a63b8ae18c66c1f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 8 Feb 2012 14:16:04 +0100 Subject: [PATCH] Used ruby_vendorarchdir instead of ruby_sitearch --- rrdtool.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rrdtool.spec b/rrdtool.spec index d012e19..c9b445a 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -18,7 +18,7 @@ Summary: Round Robin Database Tool to store and display time-series data Name: rrdtool Version: 1.4.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ with exceptions Group: Applications/Databases URL: http://oss.oetiker.ch/rrdtool/ @@ -131,7 +131,6 @@ The %{name}-tcl package includes RRDtool bindings for Tcl. %endif %if %{with_ruby} -%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')} %package ruby Summary: Ruby RRDtool bindings @@ -213,6 +212,7 @@ cp -p /usr/lib/rpm/config.{guess,sub} php4/ # Remove Rpath from Ruby %{__perl} -pi.orig -e 's|-Wl,--rpath -Wl,\$\(EPREFIX\)/lib||g' \ bindings/ruby/extconf.rb +sed -i 's| extconf.rb| extconf.rb --vendor |' bindings/Makefile %endif # 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 %defattr(-,root,root,-) %doc bindings/ruby/README -%{ruby_sitearch}/RRD.so +%{ruby_vendorarchdir}/RRD.so %endif %if %{with_lua} @@ -373,6 +373,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \ %endif %changelog +* Wed Feb 8 2012 Jaroslav Škarvada - 1.4.7-4 +- Used ruby_vendorarchdir instead of ruby_sitearch + * Wed Feb 8 2012 Jaroslav Škarvada - 1.4.7-3 - Fixed ruby(abi) requires