summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
2 files changed, 6 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 93348dbc2d2..0a344c89831 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -40,6 +40,8 @@ pkgname = shifter-slurm-runtime
depends = slurm-llnl
provides = shifter-runtime
conflicts = shifter-runtime
+ conflicts = shifter-runtime-git
+ conflicts = shifter-slurm-runtime-git
pkgname = shifter-slurm-imagegw
install = shifter-slurm-imagegw.install
@@ -59,4 +61,6 @@ pkgname = shifter-slurm-imagegw
depends = python2-pylint
provides = shifter-imagegw
conflicts = shifter-imagegw
+ conflicts = shifter-imagegw-git
+ conflicts = shifter-slurm-imagegw-git
diff --git a/PKGBUILD b/PKGBUILD
index 65fe445dc3b..0d27981a20a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -48,7 +48,7 @@ package_shifter-slurm-runtime() {
'json-c' 'xfsprogs' 'wget' 'slurm-llnl')
install="${pkgname}.install"
provides=('shifter-runtime')
- conflicts=('shifter-runtime')
+ conflicts=('shifter-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"
@@ -70,7 +70,7 @@ package_shifter-slurm-imagegw() {
'python2-redis' 'gunicorn-python2' 'python2-pylint')
install="${pkgname}.install"
provides=('shifter-imagegw')
- conflicts=('shifter-imagegw')
+ conflicts=('shifter-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"