summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKartik Mohta2017-06-27 17:03:09 -0400
committerKartik Mohta2017-06-27 17:03:09 -0400
commitb4b6f74c7caac7ccacfc2a3308f1cfec59d96178 (patch)
tree90e82ff2f94bf4eb65ed17e9d3d6e010bb628a36
parent9d4cb77e25693659ce7428908d41ff2d37cfe9eb (diff)
downloadaur-b4b6f74c7caac7ccacfc2a3308f1cfec59d96178.tar.gz
Fully separate into Python 2 and 3 packages
-rw-r--r--.SRCINFO22
-rw-r--r--PKGBUILD28
2 files changed, 13 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 512b301565c3..94bb7f521724 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,22 @@
pkgbase = python-rosinstall_generator
pkgdesc = A tool to generator rosinstall files
pkgver = 0.1.13
- pkgrel = 1
+ pkgrel = 2
url = http://wiki.ros.org/rosinstall_generator
arch = any
license = BSD
makedepends = python-setuptools
- makedepends = python2-setuptools
- source = https://files.pythonhosted.org/packages/source/r/rosinstall_generator/rosinstall_generator-0.1.13.tar.gz
- md5sums = 605826dbfea6a0e802d3b96d6f848548
-
-pkgname = python-rosinstall_generator
- depends =
depends = python
depends = python-argparse
depends = python-catkin_pkg
depends = python-rosdistro
depends = python-rospkg
depends = python-yaml
+ provides = python-rosinstall-generator
conflicts = python2-rosinstall_generator
+ conflicts = python-rosinstall-generator
+ source = https://files.pythonhosted.org/packages/source/r/rosinstall_generator/rosinstall_generator-0.1.13.tar.gz
+ md5sums = 605826dbfea6a0e802d3b96d6f848548
-pkgname = python2-rosinstall_generator
- depends =
- depends = python2
- depends = python2-argparse
- depends = python2-catkin_pkg
- depends = python2-rosdistro
- depends = python2-rospkg
- depends = python2-yaml
- conflicts = python-rosinstall_generator
+pkgname = python-rosinstall_generator
diff --git a/PKGBUILD b/PKGBUILD
index e39fe686ce35..5442253f55b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,27 @@
# Maintainer: Kartik Mohta <kartikmohta@gmail.com>
pkgbase=('python-rosinstall_generator')
-pkgname=('python-rosinstall_generator' 'python2-rosinstall_generator')
+pkgname=('python-rosinstall_generator')
_module='rosinstall_generator'
pkgver='0.1.13'
-pkgrel=1
+pkgrel=2
pkgdesc="A tool to generator rosinstall files"
url="http://wiki.ros.org/rosinstall_generator"
-depends=()
-makedepends=('python-setuptools' 'python2-setuptools')
+depends=('python' 'python-argparse' 'python-catkin_pkg' 'python-rosdistro' 'python-rospkg' 'python-yaml')
+provides=('python-rosinstall-generator')
+conflicts=('python2-rosinstall_generator' 'python-rosinstall-generator')
+makedepends=('python-setuptools')
license=('BSD')
arch=('any')
source=("https://files.pythonhosted.org/packages/source/r/rosinstall_generator/rosinstall_generator-${pkgver}.tar.gz")
md5sums=('605826dbfea6a0e802d3b96d6f848548')
-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-rosinstall_generator() {
- depends+=('python' 'python-argparse' 'python-catkin_pkg' 'python-rosdistro' 'python-rospkg' 'python-yaml')
- conflicts=('python2-rosinstall_generator')
+package() {
cd "${srcdir}/${_module}-${pkgver}"
python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}
-
-package_python2-rosinstall_generator() {
- depends+=('python2' 'python2-argparse' 'python2-catkin_pkg' 'python2-rosdistro' 'python2-rospkg' 'python2-yaml')
- conflicts=('python-rosinstall_generator')
- cd "${srcdir}/${_module}-${pkgver}-python2"
- python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-}