Date: Monday, March 28, 2011 @ 11:27:26 Author: stephane Revision: 117083
upgpkg: python-distribute 0.6.15-3 python2-distribute conflicts with setuptools Modified: python-distribute/trunk/PKGBUILD ----------+ PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-03-28 14:57:31 UTC (rev 117082) +++ PKGBUILD 2011-03-28 15:27:26 UTC (rev 117083) @@ -4,7 +4,7 @@ pkgbase=python-distribute pkgname=('python-distribute' 'python2-distribute') pkgver=0.6.15 -pkgrel=2 +pkgrel=3 pkgdesc="Easily build and distribute Python packages" arch=('any') license=('PSF') @@ -42,6 +42,7 @@ package_python2-distribute() { depends=('python2>=2.7') provides=('setuptools=0.6c11') + conflicts=('setuptools') cd "${srcdir}/distribute-${pkgver}-python2" python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build