rpms/subversion/devel subversion.spec,1.158,1.159

[jorton]

Author: jorton

Update of /cvs/extras/rpms/subversion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18522

Modified Files:
	subversion.spec 
Log Message:
* Thu Nov 26 2009 Joe Orton <jorton at redhat.com> - 1.6.6-3
- rebuild for new db4
- trim libsvn_* from dependency_libs in *.la



Index: subversion.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion/devel/subversion.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- subversion.spec	25 Nov 2009 01:11:13 -0000	1.158
+++ subversion.spec	26 Nov 2009 13:37:47 -0000	1.159
@@ -17,7 +17,7 @@
 Summary: A Modern Concurrent Version Control System
 Name: subversion
 Version: 1.6.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: ASL 1.1
 Group: Development/Tools
 URL: http://subversion.tigris.org/
@@ -192,7 +192,8 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_pa
         --disable-static --with-sasl=%{_prefix} \
         --disable-neon-version-check \
         --with-gnome-keyring \
-        --with-kwallet
+        --with-kwallet \
+        --with-berkeley-db || (cat config.log; exit 1)
 make %{?_smp_mflags} all
 make swig-py swig-py-lib %{swigdirs}
 make swig-pl swig-pl-lib swig-rb swig-rb-lib
@@ -259,10 +260,11 @@ install -m 644 $RPM_SOURCE_DIR/psvn-init
 # 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:
+# Trim exported dependencies to APR libraries only:
 sed -i "/^dependency_libs/{
      s, -l[^ ']*, ,g;
-     s,%{_libdir}/lib[^sa][^vp][^nr].*.la, ,g;
+     s, -L[^ ']*, ,g;
+     s,%{_libdir}/lib[^a][^p][^r][^ ']*.la, ,g;
      }"  $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # Install svn2cl
@@ -385,6 +387,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man1/svn2cl.1*
 
 %changelog
+* Thu Nov 26 2009 Joe Orton <jorton at redhat.com> - 1.6.6-3
+- rebuild for new db4
+- trim libsvn_* from dependency_libs in *.la
+
 * Wed Nov 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 1.6.6-2
 - rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)