summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKartik Mohta2017-06-27 17:13:26 -0400
committerKartik Mohta2017-06-27 17:13:26 -0400
commitef82fb719979e0c5dbbf9e2e14c598deeb4b12a5 (patch)
tree30767c5b2729e79cff6a1d9478ff685366f574a1
parent0e82614ca778ead8d2e9717bf039e946efe1defb (diff)
downloadaur-ef82fb719979e0c5dbbf9e2e14c598deeb4b12a5.tar.gz
Fully separate into Python 2 and 3 packages
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD43
2 files changed, 28 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 69ae1884733c..f74b75b2bdd0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
-# Generated by mksrcinfo v8
-# Tue May 3 21:34:50 UTC 2016
pkgbase = python2-rospkg
- pkgdesc = ROS - provides basic utilities for querying information about ROS packages, stacks, and distributions.
- pkgver = 1.0.39
- pkgrel = 1
- url = http://docs.ros.org/independent/api/rospkg/html/
+ pkgdesc = ROS package library
+ pkgver = 1.1.1
+ pkgrel = 2
+ url = http://wiki.ros.org/rospkg
arch = any
license = BSD
- makedepends = python2-distribute
+ makedepends = python2-setuptools
depends = python2
- provides = rospkg
- source = https://github.com/ros-infrastructure/rospkg/archive/1.0.39.tar.gz
- sha256sums = 36533bc98c57b0ee99b05b8e22160c1ee3393cd6aec7f87840b420ed7e8464cf
+ depends = python2-yaml
+ conflicts = python-rospkg
+ source = https://files.pythonhosted.org/packages/source/r/rospkg/rospkg-1.1.1.tar.gz
+ md5sums = ae63e738cc85298ebee8e0b1b78e9b56
pkgname = python2-rospkg
diff --git a/PKGBUILD b/PKGBUILD
index d83fa8ae64e6..a09cc88a75e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,26 @@
-# Contributor: Lukas Linhart <bugs@almad.net>
-# Contributor: Changaco <changaco ατ changaco δοτ net>
-# Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com>
-# Contributor: Sean Greenslade <zootboysean@gmail.com>
+# Maintainer: Kartik Mohta <kartikmohta@gmail.com>
-pkgname=python2-rospkg
-pkgver=1.0.39
-pkgrel=1
-pkgdesc="ROS - provides basic utilities for querying information about ROS packages, stacks, and distributions."
-url="http://docs.ros.org/independent/api/rospkg/html/"
-arch=('any')
+pkgbase=('python2-rospkg')
+pkgname=('python2-rospkg')
+_module='rospkg'
+pkgver='1.1.1'
+pkgrel=2
+pkgdesc="ROS package library"
+url="http://wiki.ros.org/rospkg"
+depends=('python2' 'python2-yaml')
+conflicts=('python-rospkg')
+makedepends=('python2-setuptools')
license=('BSD')
-depends=('python2')
-makedepends=('python2-distribute')
-conflicts=()
-replaces=()
-backup=()
-source=("https://github.com/ros-infrastructure/rospkg/archive/${pkgver}.tar.gz")
-sha256sums=('36533bc98c57b0ee99b05b8e22160c1ee3393cd6aec7f87840b420ed7e8464cf')
-
-provides=(rospkg)
+arch=('any')
+source=("https://files.pythonhosted.org/packages/source/r/rospkg/rospkg-${pkgver}.tar.gz")
+md5sums=('ae63e738cc85298ebee8e0b1b78e9b56')
build() {
- cd ${srcdir}/rospkg-${pkgver}
- find -type f -print0 | xargs -0 sed -i -e 's/#!\/usr\/bin\/env python/#!\/usr\/bin\/env python2/g'
- python2 setup.py build
+ cd "${srcdir}/${_module}-${pkgver}"
+ python2 setup.py build
}
+
package() {
- cd ${srcdir}/rospkg-${pkgver}
- python2 setup.py install --optimize=1 --skip-build --prefix="/usr" --root="${pkgdir}"
+ cd "${srcdir}/${_module}-${pkgver}"
+ python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}