rpms/subversion/devel subversion.spec,1.81,1.82

[fedora-cvs-commits at redhat.com]

Author: jorton

Update of /cvs/dist/rpms/subversion/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4853

Modified Files:
	subversion.spec 
Log Message:
* Thu Jul 13 2006 Joe Orton <jorton at redhat.com> 1.3.2-6
- fix ruby packaging (#191611)



Index: subversion.spec
===================================================================
RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- subversion.spec	12 Jul 2006 08:19:25 -0000	1.81
+++ subversion.spec	13 Jul 2006 08:16:18 -0000	1.82
@@ -1,5 +1,5 @@
 # set to zero to avoid running test suite
-%define make_check 0
+%define make_check 1
 
 %define with_java 1
 
@@ -8,10 +8,12 @@
 
 %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)
 
+%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
+
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.3.2
-Release: 5.1
+Release: 6
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -90,6 +92,7 @@
 Summary: Ruby bindings to the Subversion libraries
 BuildRequires: ruby-devel >= 1.8.2, ruby >= 1.8.2
 Requires: subversion = %{version}-%{release}, ruby-libs >= 1.8.2
+Requires: ruby(abi) = 1.8
 
 %description ruby
 This package includes the Ruby bindings to the Subversion libraries.
@@ -113,10 +116,13 @@
 
 # override weird -shrext from ruby
 export svn_cv_ruby_link="%{__cc} -shared"
+export svn_cv_ruby_sitedir_libsuffix=""
+export svn_cv_ruby_sitedir_archsuffix=""
 
 export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path}
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
 	--with-swig --with-neon=%{_prefix} \
+        --with-ruby-sitedir=%{ruby_sitearch} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
         --disable-static
 # 1.3.0 tarball ships with generated swig sources
@@ -160,7 +166,7 @@
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsvn_swig_*.{so,la,a}
 
 # Remove unnecessary ruby libraries
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/site_ruby/*/*/svn/ext/*.*a
+rm -f ${RPM_BUILD_ROOT}%{ruby_sitearch}/svn/ext/*.*a
 
 # Trim what goes in docdir
 rm -rf tools/*/*.in tools/test-scripts
@@ -237,8 +243,7 @@
 %files ruby
 %defattr(-,root,root,-)
 %{_libdir}/libsvn_swig_ruby*
-%{_libdir}/site_ruby/*/svn
-%{_libdir}/site_ruby/*/*-linux/svn
+%{ruby_sitearch}/svn
 
 %if %{with_java}
 %files javahl
@@ -248,7 +253,10 @@
 %endif
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - cat: /usr/include/httpd/.mmn: No such file or directory
+* Thu Jul 13 2006 Joe Orton <jorton at redhat.com> 1.3.2-6
+- fix ruby packaging (#191611)
+
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> 1.3.2-5.1
 - rebuild
 
 * Wed Jun  7 2006 Joe Orton <jorton at redhat.com> 1.3.2-5