add duplicate package josm-tested as conflict

2 files changed, 3 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 81f42f32f1ae..e2b8ee4dfd7b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,6 +12,7 @@ pkgbase = josm-stable
 	depends = sh
 	provides = josm
 	conflicts = josm
+	conflicts = josm-tested
 	noextract = josm-snapshot-18583.jar
 	backup = etc/conf.d/josm
 	source = https://josm.openstreetmap.de/download/josm-snapshot-18583.jar
diff --git a/PKGBUILD b/PKGBUILD
index f919777a9ee0..0146d269d04d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,13 +13,13 @@ arch=('any')
 url="https://josm.openstreetmap.de/"
 license=('GPL')
 depends=('hicolor-icon-theme' 'java-runtime>=11' 'ttf-font' 'sh')
-conflicts=('josm')
+conflicts=('josm' 'josm-tested')
 provides=('josm')
 makedepends=()
 changelog=$pkgname.changelog
 backup=('etc/conf.d/josm')
 source=("https://josm.openstreetmap.de/download/${_name}-snapshot-${_commit_id}.jar"
-        ${_name}.conf.d
+        "${_name}.conf.d"
         "https://josm.openstreetmap.de/export/${_commit_id}/josm/trunk/native/linux/tested/usr/share/applications/${_app_id}.desktop"
         "https://josm.openstreetmap.de/export/${_commit_id}/josm/trunk/native/linux/tested/usr/share/man/man1/${_name}.1"
         "https://josm.openstreetmap.de/export/${_commit_id}/josm/trunk/native/linux/tested/usr/share/metainfo/${_app_id}.appdata.xml"