summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKartik Mohta2017-06-27 17:02:46 -0400
committerKartik Mohta2017-06-27 17:02:46 -0400
commit53b0946a645b940f7e1ba3ba8fef2233a2704e5c (patch)
tree0bd85c1ebd2c4d32fe70733553f79cdf54cc9be0
parentc903176ad48fbaab1e39464e64057bc9c5fad9bd (diff)
downloadaur-53b0946a645b940f7e1ba3ba8fef2233a2704e5c.tar.gz
Fully separate into Python 2 and 3 packages
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD27
2 files changed, 10 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6b5a23b1152d..8459428bba08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,11 @@
pkgbase = python-rosinstall
pkgdesc = The installer for ROS
pkgver = 0.7.8
- pkgrel = 2
+ pkgrel = 3
url = http://wiki.ros.org/rosinstall
arch = any
license = BSD
makedepends = python-setuptools
- makedepends = python2-setuptools
- source = https://files.pythonhosted.org/packages/source/r/rosinstall/rosinstall-0.7.8.tar.gz
- md5sums = b52ea80b199efdb94e35229eb427965f
-
-pkgname = python-rosinstall
- depends =
depends = python
depends = python-catkin_pkg
depends = python-rosdistro
@@ -19,14 +13,8 @@ pkgname = python-rosinstall
depends = python-wstool
depends = python-yaml
conflicts = python2-rosinstall
+ source = https://files.pythonhosted.org/packages/source/r/rosinstall/rosinstall-0.7.8.tar.gz
+ md5sums = b52ea80b199efdb94e35229eb427965f
-pkgname = python2-rosinstall
- depends =
- depends = python2
- depends = python2-catkin_pkg
- depends = python2-rosdistro
- depends = python2-vcstools
- depends = python2-wstool
- depends = python2-yaml
- conflicts = python-rosinstall
+pkgname = python-rosinstall
diff --git a/PKGBUILD b/PKGBUILD
index 65d9bfc6a051..2e33c227dd93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,26 @@
# Maintainer: Kartik Mohta <kartikmohta@gmail.com>
pkgbase=('python-rosinstall')
-pkgname=('python-rosinstall' 'python2-rosinstall')
+pkgname=('python-rosinstall')
_module='rosinstall'
pkgver='0.7.8'
-pkgrel=2
+pkgrel=3
pkgdesc="The installer for ROS"
url="http://wiki.ros.org/rosinstall"
-depends=()
-makedepends=('python-setuptools' 'python2-setuptools')
+depends=('python' 'python-catkin_pkg' 'python-rosdistro' 'python-vcstools' 'python-wstool' 'python-yaml')
+conflicts=('python2-rosinstall')
+makedepends=('python-setuptools')
license=('BSD')
arch=('any')
source=("https://files.pythonhosted.org/packages/source/r/rosinstall/rosinstall-${pkgver}.tar.gz")
md5sums=('b52ea80b199efdb94e35229eb427965f')
-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() {
- depends+=('python' 'python-catkin_pkg' 'python-rosdistro' 'python-vcstools' 'python-wstool' 'python-yaml')
- conflicts=('python2-rosinstall')
+package() {
cd "${srcdir}/${_module}-${pkgver}"
python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}
-
-package_python2-rosinstall() {
- depends+=('python2' 'python2-catkin_pkg' 'python2-rosdistro' 'python2-vcstools' 'python2-wstool' 'python2-yaml')
- conflicts=('python-rosinstall')
- cd "${srcdir}/${_module}-${pkgver}-python2"
- python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-}