diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -38,6 +38,8 @@ pkgname = shifter-runtime depends = wget provides = shifter-runtime conflicts = shifter-slurm-runtime + conflicts = shifter-runtime-git + conflicts = shifter-slurm-runtime-git pkgname = shifter-imagegw install = shifter-imagegw.install @@ -56,4 +58,6 @@ pkgname = shifter-imagegw depends = python2-pylint provides = shifter-imagegw conflicts = shifter-slurm-imagegw + conflicts = shifter-imagegw-git + conflicts = shifter-slurm-imagegw-git @@ -47,7 +47,7 @@ package_shifter-runtime() { 'json-c' 'xfsprogs' 'wget') install="${pkgname}.install" provides=('shifter-runtime') - conflicts=('shifter-slurm-runtime') + conflicts=('shifter-slurm-runtime' 'shifter-runtime-git' 'shifter-slurm-runtime-git') cd "${srcdir}/shifter-${pkgver}_${pkgrel}" make DESTDIR="${pkgdir}" install install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" @@ -69,7 +69,7 @@ package_shifter-imagegw() { 'python2-redis' 'gunicorn-python2' 'python2-pylint') install="${pkgname}.install" provides=('shifter-imagegw') - conflicts=('shifter-slurm-imagegw') + conflicts=('shifter-slurm-imagegw' 'shifter-imagegw-git' 'shifter-slurm-imagegw-git') cd "${srcdir}/shifter-${pkgver}_${pkgrel}" make DESTDIR="${pkgdir}" install install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" |