[packages/subversion] fix ruby packaging with vendordir support

[glen]

commit dd30c67423af72e13af05e111e03cfa074c0ccfe
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu Apr 25 19:15:41 2013 +0300

    fix ruby packaging with vendordir support

 subversion.spec | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/subversion.spec b/subversion.spec
index cdc10ba..259d24c 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -94,7 +94,7 @@ BuildRequires:	libtool >= 1.4-9
 BuildRequires:	pkgconfig
 %{?with_csvn:BuildRequires:	python-ctypesgen}
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.583
+BuildRequires:	rpmbuild(macros) >= 1.656
 BuildRequires:	sed >= 4.0
 BuildRequires:	sqlite3-devel >= 3.6.18
 BuildRequires:	texinfo
@@ -477,7 +477,11 @@ chmod +x ./autogen.sh && ./autogen.sh
 %if %{without swig}
 	--without-swig \
 %endif
-%if %{without ruby}
+%if %{with ruby}
+	svn_cv_ruby_sitedir_libsuffix="" \
+	svn_cv_ruby_sitedir_archsuffix="" \
+	--with-ruby-sitedir=%{ruby_vendorarchdir} \
+%else
 	ac_cv_path_RUBY=none \
 %endif
 %if %{with csvn}
@@ -639,7 +643,7 @@ cp -p tools/examples/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %if %{with swig}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libsvn_swig*.{la,a}
 %if %{with ruby}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/ruby/site_ruby/*/*/svn/ext/*.la
+%{__rm} $RPM_BUILD_ROOT%{ruby_vendorarchdir}/svn/ext/*.la
 %endif
 %endif
 %if %{with gnome} || %{with kwallet}
@@ -946,11 +950,10 @@ fi
 %attr(755,root,root) %{_libdir}/libsvn_swig_ruby-1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsvn_swig_ruby-1.so.0
 %attr(755,root,root) %{_libdir}/libsvn_swig_ruby-1.so
-%dir %{ruby_sitelibdir}/svn
-%{ruby_sitelibdir}/svn/*.rb
-%dir %{ruby_sitearchdir}/svn
-%dir %{ruby_sitearchdir}/svn/ext
-%attr(755,root,root) %{ruby_sitearchdir}/svn/ext/*.so
+%dir %{ruby_vendorarchdir}/svn
+%{ruby_vendorarchdir}/svn/*.rb
+%dir %{ruby_vendorarchdir}/svn/ext
+%attr(755,root,root) %{ruby_vendorarchdir}/svn/ext/*.so
 %{ruby_ridir}/Svn
 %endif
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/subversion.git/commitdiff/dd30c67423af72e13af05e111e03cfa074c0ccfe