From 065251b562939ebb28f17755b3bbdb7616630b12 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 10 Aug 2023 00:21:29 +0300 Subject: [PATCH] packaging: set the system executables installation directory to /usr/bin for Arch fixes filesystem conflicts due to `pacman` not able to merge the directory into the system (because /usr/sbin is symlink on Arch) Signed-off-by: Ivailo Monev --- packaging/archlinux/katana-extraapps/PKGBUILD | 2 +- packaging/archlinux/katana-workspace/PKGBUILD | 2 +- packaging/archlinux/katanalibs/PKGBUILD | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packaging/archlinux/katana-extraapps/PKGBUILD b/packaging/archlinux/katana-extraapps/PKGBUILD index fe6b874..0425444 100644 --- a/packaging/archlinux/katana-extraapps/PKGBUILD +++ b/packaging/archlinux/katana-extraapps/PKGBUILD @@ -3,7 +3,7 @@ # https://wiki.archlinux.org/index.php/Arch_package_guidelines pkgname=katana-extraapps -pkgver=4.23.0.r1536.698d7f49 +pkgver=4.23.0.r1598.863be40c pkgrel=1 pkgdesc="Katana extra applications" arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm') diff --git a/packaging/archlinux/katana-workspace/PKGBUILD b/packaging/archlinux/katana-workspace/PKGBUILD index 5873f08..13121a2 100644 --- a/packaging/archlinux/katana-workspace/PKGBUILD +++ b/packaging/archlinux/katana-workspace/PKGBUILD @@ -3,7 +3,7 @@ # https://wiki.archlinux.org/index.php/Arch_package_guidelines pkgname=katana-workspace -pkgver=4.23.0.r2460.d64cfc28 +pkgver=4.23.0.r2646.f6818c64 pkgrel=1 pkgdesc="Katana workspace interface, base applications and tools" arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm') diff --git a/packaging/archlinux/katanalibs/PKGBUILD b/packaging/archlinux/katanalibs/PKGBUILD index eee6865..55df313 100644 --- a/packaging/archlinux/katanalibs/PKGBUILD +++ b/packaging/archlinux/katanalibs/PKGBUILD @@ -3,7 +3,7 @@ # https://wiki.archlinux.org/index.php/Arch_package_guidelines pkgname=katanalibs -pkgver=4.23.0.r4289.f3b9c12f +pkgver=4.23.0.r4502.0f0dcc7b pkgrel=1 pkgdesc="Katana core libraries" arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm') @@ -35,7 +35,8 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DKDE4_SYSCONF_INSTALL_DIR=/etc \ - -DKDE4_LIBEXEC_INSTALL_DIR=/usr/lib/kde4 + -DKDE4_LIBEXEC_INSTALL_DIR=/usr/lib/kde4 \ + -DKDE4_SBIN_INSTALL_DIR=/usr/bin make }