- trim dependencies from .la files

- detabify spec file
- test suite disabled to ease stress on builders

subversion.spec

@@ -1,5 +1,5 @@
 # set to zero to avoid running test suite
-%define make_check 1
+%define make_check 0
 
 %define with_java 1
 
@@ -15,7 +15,7 @@
 Summary: Modern Version Control System designed to replace CVS
 Name: subversion
 Version: 1.4.4
-Release: 3
+Release: 4
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -124,7 +124,7 @@ 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-swig --with-neon=%{_prefix} \
         --with-ruby-sitedir=%{ruby_sitearch} \
         --with-apxs=%{_sbindir}/apxs --disable-mod-activation \
         --disable-static
@@ -134,7 +134,7 @@ make %{?_smp_mflags} all
 make swig-py swig-py-lib %{swigdirs}
 make swig-pl swig-pl-lib swig-rb swig-rb-lib
 %if %{with_java}
-make javahl
+make %{?_smp_mflags} javahl
 %endif
 
 %install
@@ -184,6 +184,12 @@ done
 # Rename authz_svn INSTALL doc for docdir
 ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL
 
+# Trim exported dependencies to SVN and APR libraries only:
+sed -i "/^dependency_libs/{
+     s, -l[^ ']*, ,g;
+     s,%{_libdir}/lib[^sa][^vp][^nr].*.la, ,g;
+     }"  $RPM_BUILD_ROOT%{_libdir}/*.la
+
 %find_lang %{name}
 
 %if %{make_check}
@@ -267,6 +273,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Wed Aug 22 2007 Joe Orton <jorton@redhat.com> 1.4.4-4
+- trim dependencies from .la files
+- detabify spec file
+- test suite disabled to ease stress on builders
+
 * Wed Aug  8 2007 Joe Orton <jorton@redhat.com> 1.4.4-3
 - fix build with new glibc open()-as-macro
 - build all swig code in %%build, not %%install