From f303479c9b8cd0e8c9864cb817b7b7a4d06bbafb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 1 Nov 2021 17:46:09 +0100 Subject: ArchLinux tdelibs: Fix unwanted conflict with kdelibs. This resolves issue TDE/tde#68. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 2a76de9cd079cdf6900cf7dfc0f9c8eacba016d7) --- arch/tde-core/tde-tdelibs/PKGBUILD | 4 ++-- 1 file 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") -- cgit v1.2.1