summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKartik Mohta2017-06-27 17:02:21 -0400
committerKartik Mohta2017-06-27 17:02:21 -0400
commitf4cf1b0867fcbe402a207fb3fab8c453cdb598b2 (patch)
tree8da42e70c96bdd1e1838949b38ff4f601f53221d
parent39c925fdc2418b525dcaad048461fab1a7f79cce (diff)
downloadaur-f4cf1b0867fcbe402a207fb3fab8c453cdb598b2.tar.gz
Fully separate into Python 2 and 3 packages
-rw-r--r--.SRCINFO18
-rw-r--r--PKGBUILD27
2 files changed, 10 insertions, 35 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 840bb7d476b..28ca8acb374 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,18 @@
pkgbase = python-rosdistro
pkgdesc = A tool to work with rosdistro files
pkgver = 0.6.2
- pkgrel = 1
+ pkgrel = 2
url = http://wiki.ros.org/rosdistro
arch = any
license = BSD
makedepends = python-setuptools
- makedepends = python2-setuptools
- source = https://files.pythonhosted.org/packages/source/r/rosdistro/rosdistro-0.6.2.tar.gz
- md5sums = 5ef1af890d0fc92c6920c4c86ef498cd
-
-pkgname = python-rosdistro
- depends =
depends = python
depends = python-catkin_pkg
depends = python-rospkg
depends = python-yaml
conflicts = python2-rosdistro
+ source = https://files.pythonhosted.org/packages/source/r/rosdistro/rosdistro-0.6.2.tar.gz
+ md5sums = 5ef1af890d0fc92c6920c4c86ef498cd
-pkgname = python2-rosdistro
- depends =
- depends = python2
- depends = python2-catkin_pkg
- depends = python2-rospkg
- depends = python2-yaml
- conflicts = python-rosdistro
+pkgname = python-rosdistro
diff --git a/PKGBUILD b/PKGBUILD
index b16777d3c7b..8c0f122c86e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,26 @@
# Maintainer: Kartik Mohta <kartikmohta@gmail.com>
pkgbase=('python-rosdistro')
-pkgname=('python-rosdistro' 'python2-rosdistro')
+pkgname=('python-rosdistro')
_module='rosdistro'
pkgver='0.6.2'
-pkgrel=1
+pkgrel=2
pkgdesc="A tool to work with rosdistro files"
url="http://wiki.ros.org/rosdistro"
-depends=()
-makedepends=('python-setuptools' 'python2-setuptools')
+depends=('python' 'python-catkin_pkg' 'python-rospkg' 'python-yaml')
+conflicts=('python2-rosdistro')
+makedepends=('python-setuptools')
license=('BSD')
arch=('any')
source=("https://files.pythonhosted.org/packages/source/r/rosdistro/rosdistro-${pkgver}.tar.gz")
md5sums=('5ef1af890d0fc92c6920c4c86ef498cd')
-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-rosdistro() {
- depends+=('python' 'python-catkin_pkg' 'python-rospkg' 'python-yaml')
- conflicts=('python2-rosdistro')
+package() {
cd "${srcdir}/${_module}-${pkgver}"
python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}
-
-package_python2-rosdistro() {
- depends+=('python2' 'python2-catkin_pkg' 'python2-rospkg' 'python2-yaml')
- conflicts=('python-rosdistro')
- cd "${srcdir}/${_module}-${pkgver}-python2"
- python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-}