diff options
| author | kyechou | 2017-08-01 15:05:28 +0800 |
|---|---|---|
| committer | kyechou | 2017-08-01 15:05:28 +0800 |
| commit | 397a144e0df8be704c86ef476bb7642fac8cce4a (patch) | |
| tree | 0179ae7824eb4c89c39101d570387a6549dc0f26 /PKGBUILD | |
| parent | eba2a646944e4eb98e9719e2d9d7732b97ccd2ac (diff) | |
| download | aur-397a144e0df8be704c86ef476bb7642fac8cce4a.tar.gz | |
add conflicting packages
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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" |