summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-11-01 17:46:09 +0100
committerSlávek Banko <slavek.banko@axis.cz>2021-11-01 17:46:09 +0100
commit2a76de9cd079cdf6900cf7dfc0f9c8eacba016d7 (patch)
tree28cd6179416923acff1a258d05411aab41e5cbe3
parent1838e1a41f12414ad989d5f1c712ef0c62df9bf1 (diff)
downloadtde-packaging-2a76de9cd079cdf6900cf7dfc0f9c8eacba016d7.tar.gz
tde-packaging-2a76de9cd079cdf6900cf7dfc0f9c8eacba016d7.zip
ArchLinux tdelibs: Fix unwanted conflict with kdelibs.
This resolves issue TDE/tde#68. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--arch/tde-core/tde-tdelibs/PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/tde-core/tde-tdelibs/PKGBUILD b/arch/tde-core/tde-tdelibs/PKGBUILD
index 9e930a584..f63821c0e 100644
--- a/arch/tde-core/tde-tdelibs/PKGBUILD
+++ b/arch/tde-core/tde-tdelibs/PKGBUILD
@@ -9,7 +9,7 @@ _kdemod="${_mod/tde/kde}"
pkgname="tde-${_mod}"
pkgver=14.0.11
-pkgrel=1
+pkgrel=2
pkgdesc="Trinity Desktop core libraries and applications"
arch=('i686' 'x86_64')
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
@@ -38,7 +38,7 @@ depends=('aspell'
'xorg-xsetroot')
makedepends=('tde-cmake-trinity')
provides=("${_mod}")
-conflicts=("trinity-${_kdemod}" "trinity-${_mod}" "kdemod3-${_kdemod}" "${_kdemod}")
+conflicts=("trinity-${_kdemod}" "trinity-${_mod}" "kdemod3-${_kdemod}" "${_kdemod}3")
replaces=("trinity-${_kdemod}" "trinity-${_mod}")
options=('staticlibs' 'libtool' '!makeflags' '!strip')
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")