- rebuild for new db4

- trim libsvn_* from dependency_libs in *.la
This commit is contained in:
jorton 2009-11-26 13:37:47 +00:00
parent 87d0a24c91
commit ab5874983b

View File

@ -17,7 +17,7 @@
Summary: A Modern Concurrent Version Control System Summary: A Modern Concurrent Version Control System
Name: subversion Name: subversion
Version: 1.6.6 Version: 1.6.6
Release: 2%{?dist} Release: 3%{?dist}
License: ASL 1.1 License: ASL 1.1
Group: Development/Tools Group: Development/Tools
URL: http://subversion.tigris.org/ URL: http://subversion.tigris.org/
@ -192,7 +192,8 @@ export CC=gcc CXX=g++ JAVA_HOME=%{jdk_path} CFLAGS="$RPM_OPT_FLAGS"
--disable-static --with-sasl=%{_prefix} \ --disable-static --with-sasl=%{_prefix} \
--disable-neon-version-check \ --disable-neon-version-check \
--with-gnome-keyring \ --with-gnome-keyring \
--with-kwallet --with-kwallet \
--with-berkeley-db || (cat config.log; exit 1)
make %{?_smp_mflags} all make %{?_smp_mflags} all
make swig-py swig-py-lib %{swigdirs} make swig-py swig-py-lib %{swigdirs}
make swig-pl swig-pl-lib swig-rb swig-rb-lib make swig-pl swig-pl-lib swig-rb swig-rb-lib
@ -259,10 +260,11 @@ install -m 644 $RPM_SOURCE_DIR/psvn-init.el \
# Rename authz_svn INSTALL doc for docdir # Rename authz_svn INSTALL doc for docdir
ln -f subversion/mod_authz_svn/INSTALL mod_authz_svn-INSTALL 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/{ sed -i "/^dependency_libs/{
s, -l[^ ']*, ,g; 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 }" $RPM_BUILD_ROOT%{_libdir}/*.la
# Install svn2cl # Install svn2cl
@ -385,6 +387,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_mandir}/man1/svn2cl.1* %{_mandir}/man1/svn2cl.1*
%changelog %changelog
* Thu Nov 26 2009 Joe Orton <jorton@redhat.com> - 1.6.6-3
- rebuild for new db4
- trim libsvn_* from dependency_libs in *.la
* Wed Nov 25 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.6.6-2 * Wed Nov 25 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.6.6-2
- rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI) - rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)