Remove conflict between python 2 and 3 versions.

2 files changed, 3 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ef7b3e1aa82c..a36e2de5b170 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = python-ase
 	pkgdesc = Atomic Simulation Environment (ASE) is a set of tools and Python modules for setting up, manipulating, running, visualizing and analyzing atomistic simulations.
 	pkgver = 3.11.0
-	pkgrel = 2
+	pkgrel = 3
 	url = http://wiki.fysik.dtu.dk/ase
 	arch = any
 	license = LGPLv2.1+
@@ -14,12 +14,10 @@ pkgname = python-ase
 	optdepends = python-scipy: For extra functionality
 	optdepends = python-matplotlib: 2D Plotting
 	optdepends = pygtk: For ase.gui
-	conflicts = python2-ase
 
 pkgname = python2-ase
 	depends = python2-numpy
 	optdepends = python2-scipy: For extra functionality
 	optdepends = python2-matplotlib: 2D Plotting
 	optdepends = pygtk: For ase.gui
-	conflicts = python-ase
 
diff --git a/PKGBUILD b/PKGBUILD
index 875d11ac668a..256313d6cbeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=('python-ase' 'python2-ase')
 pkgver=3.11.0
 _sha=88f25faf32519e6e191d1e702b0554d2e5f43399
-pkgrel=2
+pkgrel=3
 pkgdesc="Atomic Simulation Environment (ASE) is a set of tools and Python modules for setting up, manipulating, running, visualizing and analyzing atomistic simulations."
 url="http://wiki.fysik.dtu.dk/ase"
 arch=("any")
@@ -17,7 +17,6 @@ prepare() {
 
 package_python-ase() {
     depends=('python-numpy')
-    conflicts=('python2-ase')
     optdepends=('python-scipy: For extra functionality' 'python-matplotlib: 2D Plotting' 'pygtk: For ase.gui')
     cd "$srcdir/ase-$pkgver-$_sha"
     python setup.py install --root="$pkgdir/" --optimize=1
@@ -25,8 +24,8 @@ package_python-ase() {
 
 package_python2-ase() {
     depends=('python2-numpy')
-    conflicts=('python-ase')
     optdepends=('python2-scipy: For extra functionality' 'python2-matplotlib: 2D Plotting' 'pygtk: For ase.gui')
     cd "$srcdir/ase-$pkgver-$_sha-py2"
     python2 setup.py install --root="$pkgdir/" --optimize=1
+    rename ase ase2 $pkgdir/usr/bin/*
 }