diff --git a/buildout/software-profiles/pysvn-python.cfg b/buildout/software-profiles/pysvn-python.cfg index 1fb2c0f1bf156b3d6bcba9737656ab31dda461f1..f4a231982c0a3d5f0fc47720783032ecdb84dae8 100644 --- a/buildout/software-profiles/pysvn-python.cfg +++ b/buildout/software-profiles/pysvn-python.cfg @@ -1,8 +1,6 @@ [buildout] extends = - ../software-profiles/libexpat.cfg - ../software-profiles/neon.cfg - ../software-profiles/openssl.cfg + ../software-profiles/apache.cfg ../software-profiles/subversion.cfg parts = @@ -18,8 +16,5 @@ include-dirs = library-dirs = ${subversion:location}/lib ${apache:location}/lib - ${neon:location}/lib - ${libexpat:location}/lib - ${openssl:location}/lib # heavily patched version that supports --include-dirs and --library-dirs -find-links = http://www.nexedi.org/static/packages/source/pysvn-1.7.4nxd001.tar.gz +find-links = http://www.nexedi.org/static/packages/source/pysvn-1.7.4nxd002.tar.gz diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py index 7cdfb11572acadc58db693836504c2ef39b5fc82..ef2c6b20fc6d18345dc327a8c65ebd117965272e 100644 --- a/buildout/tests/assertSoftware.py +++ b/buildout/tests/assertSoftware.py @@ -1454,20 +1454,14 @@ class AssertPysvn(AssertSoftwareMixin): python_version_major, python_version_minor), [ 'libc', 'libcom_err', - 'libexpat', 'libgcc_s', 'libm', - 'libneon', 'libresolv', - 'libssl', 'libstdc++', 'libsvn_client-1', 'libsvn_diff-1', 'libsvn_repos-1', ], [ - 'libexpat', - 'neon', - 'openssl', 'subversion' ])