summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hummel2023-12-21 08:50:35 -0700
committerDavid Hummel2023-12-21 08:50:35 -0700
commite9c28b1a3cd3af1448563e52ff7f83834098dcad (patch)
tree6d161ec3c5629f1c449d5b08c2f8807afb949d82
parent3d236481eba9a261dedde5b392dd9fdf59a5336e (diff)
downloadaur-e9c28b1a3cd3af1448563e52ff7f83834098dcad.tar.gz
Add missing conflicts
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
2 files changed, 4 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 19dd243e4833..227270684b0e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -37,6 +37,7 @@ pkgname = mod_tile
depends = curl
depends = glib2
provides = mod_tile
+ conflicts = mod_tile
pkgname = renderd
pkgdesc = A daemon that renders map tiles using mapnik
@@ -46,4 +47,5 @@ pkgname = renderd
depends = iniparser
depends = mapnik
provides = renderd
+ conflicts = renderd
backup = etc/renderd.conf
diff --git a/PKGBUILD b/PKGBUILD
index f6f640e6a9ed..4d84fab9acb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,6 +32,7 @@ check() {
}
package_mod_tile() {
+ conflicts=('mod_tile')
depends=('apache' 'apr' 'cairo' 'curl' 'glib2')
install="${pkgname}.install"
pkgdesc='An Apache 2 module to deliver map tiles'
@@ -52,6 +53,7 @@ package_mod_tile() {
}
package_renderd() {
+ conflicts=('renderd')
backup=('etc/renderd.conf')
depends=('cairo' 'curl' 'glib2' 'iniparser' 'mapnik')
pkgdesc='A daemon that renders map tiles using mapnik'