diff options
| author | Kartik Mohta | 2017-06-18 15:07:59 -0400 |
|---|---|---|
| committer | Kartik Mohta | 2017-06-18 15:07:59 -0400 |
| commit | c903176ad48fbaab1e39464e64057bc9c5fad9bd (patch) | |
| tree | 5cbc8b21fe62f426bb2ea39253ee120df88824de | |
| parent | 7047f8ae98e6b37b33a92f95dd43b481e72060e0 (diff) | |
| download | aur-c903176ad48fbaab1e39464e64057bc9c5fad9bd.tar.gz | |
Add conflicts between the Python 2 & 3 packages
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
2 files changed, 6 insertions, 4 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Thu Jun 1 03:35:54 UTC 2017 pkgbase = python-rosinstall pkgdesc = The installer for ROS pkgver = 0.7.8 - pkgrel = 1 + pkgrel = 2 url = http://wiki.ros.org/rosinstall arch = any license = BSD @@ -20,6 +18,7 @@ pkgname = python-rosinstall depends = python-vcstools depends = python-wstool depends = python-yaml + conflicts = python2-rosinstall pkgname = python2-rosinstall depends = @@ -29,4 +28,5 @@ pkgname = python2-rosinstall depends = python2-vcstools depends = python2-wstool depends = python2-yaml + conflicts = python-rosinstall @@ -4,7 +4,7 @@ pkgbase=('python-rosinstall') pkgname=('python-rosinstall' 'python2-rosinstall') _module='rosinstall' pkgver='0.7.8' -pkgrel=1 +pkgrel=2 pkgdesc="The installer for ROS" url="http://wiki.ros.org/rosinstall" depends=() @@ -28,12 +28,14 @@ build() { package_python-rosinstall() { depends+=('python' 'python-catkin_pkg' 'python-rosdistro' 'python-vcstools' 'python-wstool' 'python-yaml') + conflicts=('python2-rosinstall') 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 } |