diff options
| author | kyechou | 2017-07-31 10:44:55 +0800 |
|---|---|---|
| committer | kyechou | 2017-07-31 10:44:55 +0800 |
| commit | caca6a454c77e22dfc8a2f96f8d5a7bb3bbd6742 (patch) | |
| tree | 546622ae7c1afa9119ceaa80267a80358bab1b84 | |
| parent | f688754e0fd01f7540571df235cd478887bcdda6 (diff) | |
| download | aur-caca6a454c77e22dfc8a2f96f8d5a7bb3bbd6742.tar.gz | |
change the name of the conflicting packages
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -39,7 +39,7 @@ pkgname = shifter-runtime depends = xfsprogs depends = wget provides = shifter-runtime - conflicts = shifter-runtime-slurm + conflicts = shifter-slurm-runtime pkgname = shifter-imagegw install = shifter-imagegw.install @@ -57,5 +57,5 @@ pkgname = shifter-imagegw depends = gunicorn-python2 depends = python2-pylint provides = shifter-imagegw - conflicts = shifter-imagegw-slurm + conflicts = shifter-slurm-imagegw @@ -50,7 +50,7 @@ package_shifter-runtime() { 'json-c' 'xfsprogs' 'wget') install="${pkgname}.install" provides=('shifter-runtime') - conflicts=('shifter-runtime-slurm') + conflicts=('shifter-slurm-runtime') cd "${srcdir}/shifter-${pkgver}_${pkgrel}" make DESTDIR="${pkgdir}" install install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" @@ -72,7 +72,7 @@ package_shifter-imagegw() { 'python2-redis' 'gunicorn-python2' 'python2-pylint') install="${pkgname}.install" provides=('shifter-imagegw') - conflicts=('shifter-imagegw-slurm') + conflicts=('shifter-slurm-imagegw') cd "${srcdir}/shifter-${pkgver}_${pkgrel}" make DESTDIR="${pkgdir}" install install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" |