summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKartik Mohta2017-06-27 16:28:45 -0400
committerKartik Mohta2017-06-27 16:28:45 -0400
commitd06fad646f36814c6d364324db6a9dc195df3369 (patch)
treeebbfc73a2fa1a2a951da00ebe2057a7e2f4e5aa3
parent475cc59c4d54beea25a9e841de08fe3bb34457b3 (diff)
downloadaur-d06fad646f36814c6d364324db6a9dc195df3369.tar.gz
Testing separation of Py2 & 3 packages but keeping same pkgbase
-rw-r--r--.SRCINFO15
-rw-r--r--PKGBUILD23
2 files changed, 6 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c5144d39337..72f7dfa0011 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,7 +6,6 @@ pkgbase = python-catkin_pkg
arch = any
license = BSD
makedepends = python-setuptools
- makedepends = python2-setuptools
source = https://files.pythonhosted.org/packages/source/c/catkin_pkg/catkin_pkg-0.3.5.tar.gz
md5sums = de01650bbec245d53f72682ed7ab13e5
@@ -16,17 +15,7 @@ pkgname = python-catkin_pkg
depends = python-argparse
depends = python-dateutil
depends = python-docutils
- conflicts = python-catkin-pkg
+ provides = python-catkin-pkg
conflicts = python2-catkin_pkg
- replaces = python-catkin-pkg
-
-pkgname = python2-catkin_pkg
- depends =
- depends = python2
- depends = python2-argparse
- depends = python2-dateutil
- depends = python2-docutils
- conflicts = python2-catkin-pkg
- conflicts = python-catkin_pkg
- replaces = python2-catkin-pkg
+ conflicts = python-catkin-pkg
diff --git a/PKGBUILD b/PKGBUILD
index ecd3b42695f..ff473832c7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,28 @@
# Maintainer: Kartik Mohta <kartikmohta@gmail.com>
pkgbase=('python-catkin_pkg')
-pkgname=('python-catkin_pkg' 'python2-catkin_pkg')
+pkgname=('python-catkin_pkg')
_module='catkin_pkg'
pkgver='0.3.5'
pkgrel=1
pkgdesc="catkin package library"
url="http://wiki.ros.org/catkin_pkg"
depends=()
-makedepends=('python-setuptools' 'python2-setuptools')
+makedepends=('python-setuptools')
license=('BSD')
arch=('any')
source=("https://files.pythonhosted.org/packages/source/c/catkin_pkg/catkin_pkg-${pkgver}.tar.gz")
md5sums=('de01650bbec245d53f72682ed7ab13e5')
-prepare() {
- cp -a "${srcdir}/${_module}-${pkgver}"{,-python2}
-}
-
build() {
cd "${srcdir}/${_module}-${pkgver}"
python setup.py build
-
- cd "${srcdir}/${_module}-${pkgver}-python2"
- python2 setup.py build
}
package_python-catkin_pkg() {
depends+=('python' 'python-argparse' 'python-dateutil' 'python-docutils')
- conflicts=('python-catkin-pkg' 'python2-catkin_pkg')
- replaces=('python-catkin-pkg')
+ provides=('python-catkin-pkg')
+ conflicts=('python2-catkin_pkg' 'python-catkin-pkg')
cd "${srcdir}/${_module}-${pkgver}"
python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}
-
-package_python2-catkin_pkg() {
- depends+=('python2' 'python2-argparse' 'python2-dateutil' 'python2-docutils')
- conflicts=('python2-catkin-pkg' 'python-catkin_pkg')
- replaces=('python2-catkin-pkg')
- cd "${srcdir}/${_module}-${pkgver}-python2"
- python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-}