removed conflict declaration

2 files changed, 3 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ca767c365f9..f28549090aec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,10 +6,6 @@ pkgbase = openhab3
 	arch = any
 	license = EPL
 	depends = java-runtime-headless=11
-	conflicts = openhab-runtime
-	conflicts = openhab-addons
-	conflicts = openhab-beta
-	conflicts = openhab2
 	noextract = openhab-3.0.0.M4.tar.gz
 	backup = etc/openhab3/services/addons.cfg
 	backup = etc/openhab3/services/runtime.cfg
diff --git a/PKGBUILD b/PKGBUILD
index aa15ecd1f27a..5e4a08d24fdc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,6 @@ url="http://www.openhab.org/"
 license=("EPL")
 depends=("java-runtime-headless=11")
 
-conflicts=("openhab-runtime" "openhab-addons" "openhab-beta" "openhab2")
-
 backup=("etc/${pkgname}/services/addons.cfg"
         "etc/${pkgname}/services/runtime.cfg"
         "etc/default/${pkgname}"
@@ -51,6 +49,8 @@ package() {
     mkdir -p "${pkgdir}/usr/share"
     cp -r "${srcdir}/${pkgname}" "${pkgdir}/usr/share"
 
+    mkdir -p "${pkgdir}/var/log/${pkgname}"
+
     rm -fr "${pkgdir}/usr/share/${pkgname}/conf"
     rm -fr "${pkgdir}/usr/share/${pkgname}/userdata"
 
@@ -58,5 +58,5 @@ package() {
     echo "Z /etc/${pkgname} - ${pkgname} ${pkgname} -" | install -Dm644 /dev/stdin "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
     echo "Z /usr/share/${pkgname} - ${pkgname} ${pkgname} -" >> "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
     echo "Z /var/lib/${pkgname} - ${pkgname} ${pkgname} -" >> "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
-    echo "d /var/log/${pkgname} - ${pkgname} ${pkgname} -" >> "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+    echo "z /var/log/${pkgname} - ${pkgname} ${pkgname} -" >> "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
 }