Fully separate into Python 2 and 3 packages

2 files changed, 10 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 72f7dfa0011a..9231f6686759 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,11 @@
 pkgbase = python-catkin_pkg
 	pkgdesc = catkin package library
 	pkgver = 0.3.5
-	pkgrel = 1
+	pkgrel = 2
 	url = http://wiki.ros.org/catkin_pkg
 	arch = any
 	license = BSD
 	makedepends = python-setuptools
-	source = https://files.pythonhosted.org/packages/source/c/catkin_pkg/catkin_pkg-0.3.5.tar.gz
-	md5sums = de01650bbec245d53f72682ed7ab13e5
-
-pkgname = python-catkin_pkg
-	depends = 
 	depends = python
 	depends = python-argparse
 	depends = python-dateutil
@@ -18,4 +13,8 @@ pkgname = python-catkin_pkg
 	provides = python-catkin-pkg
 	conflicts = python2-catkin_pkg
 	conflicts = python-catkin-pkg
+	source = https://files.pythonhosted.org/packages/source/c/catkin_pkg/catkin_pkg-0.3.5.tar.gz
+	md5sums = de01650bbec245d53f72682ed7ab13e5
+
+pkgname = python-catkin_pkg
 
diff --git a/PKGBUILD b/PKGBUILD
index ff473832c7e3..6f59b8f51d4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,12 @@ pkgbase=('python-catkin_pkg')
 pkgname=('python-catkin_pkg')
 _module='catkin_pkg'
 pkgver='0.3.5'
-pkgrel=1
+pkgrel=2
 pkgdesc="catkin package library"
 url="http://wiki.ros.org/catkin_pkg"
-depends=()
+depends=('python' 'python-argparse' 'python-dateutil' 'python-docutils')
+provides=('python-catkin-pkg')
+conflicts=('python2-catkin_pkg' 'python-catkin-pkg')
 makedepends=('python-setuptools')
 license=('BSD')
 arch=('any')
@@ -19,10 +21,7 @@ build() {
     python setup.py build
 }
 
-package_python-catkin_pkg() {
-    depends+=('python' 'python-argparse' 'python-dateutil' 'python-docutils')
-    provides=('python-catkin-pkg')
-    conflicts=('python2-catkin_pkg' 'python-catkin-pkg')
+package() {
     cd "${srcdir}/${_module}-${pkgver}"
     python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
 }