summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKartik Mohta2017-06-27 17:03:26 -0400
committerKartik Mohta2017-06-27 17:03:26 -0400
commit2b7ba33041c0af63f62f48770ababd86dc34550a (patch)
tree5fab41210f496aa294c32eaf0ea54665b373525c
parente6b7be415937fb5ebf112b5793aec3fc56f048c0 (diff)
downloadaur-2b7ba33041c0af63f62f48770ababd86dc34550a.tar.gz
Fully separate into Python 2 and 3 packages
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD27
2 files changed, 10 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 54979821b0ee..28e1094bfa6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,16 @@
pkgbase = python-rospkg
pkgdesc = ROS package library
pkgver = 1.1.1
- pkgrel = 1
+ pkgrel = 2
url = http://wiki.ros.org/rospkg
arch = any
license = BSD
makedepends = python-setuptools
- makedepends = python2-setuptools
- source = https://files.pythonhosted.org/packages/source/r/rospkg/rospkg-1.1.1.tar.gz
- md5sums = ae63e738cc85298ebee8e0b1b78e9b56
-
-pkgname = python-rospkg
- depends =
depends = python
depends = python-yaml
conflicts = python2-rospkg
+ source = https://files.pythonhosted.org/packages/source/r/rospkg/rospkg-1.1.1.tar.gz
+ md5sums = ae63e738cc85298ebee8e0b1b78e9b56
-pkgname = python2-rospkg
- depends =
- depends = python2
- depends = python2-yaml
- conflicts = python-rospkg
+pkgname = python-rospkg
diff --git a/PKGBUILD b/PKGBUILD
index 00d03a2798ce..564100a62779 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,26 @@
# Maintainer: Kartik Mohta <kartikmohta@gmail.com>
pkgbase=('python-rospkg')
-pkgname=('python-rospkg' 'python2-rospkg')
+pkgname=('python-rospkg')
_module='rospkg'
pkgver='1.1.1'
-pkgrel=1
+pkgrel=2
pkgdesc="ROS package library"
url="http://wiki.ros.org/rospkg"
-depends=()
-makedepends=('python-setuptools' 'python2-setuptools')
+depends=('python' 'python-yaml')
+conflicts=('python2-rospkg')
+makedepends=('python-setuptools')
license=('BSD')
arch=('any')
source=("https://files.pythonhosted.org/packages/source/r/rospkg/rospkg-${pkgver}.tar.gz")
md5sums=('ae63e738cc85298ebee8e0b1b78e9b56')
-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-rospkg() {
- depends+=('python' 'python-yaml')
- conflicts=('python2-rospkg')
+package() {
cd "${srcdir}/${_module}-${pkgver}"
python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}
-
-package_python2-rospkg() {
- depends+=('python2' 'python2-yaml')
- conflicts=('python-rospkg')
- cd "${srcdir}/${_module}-${pkgver}-python2"
- python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-}