From 9fbd9a7ae6a6fbe49af4b8e3215ea14e922f179a Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 4 May 2015 10:52:40 +0200 Subject: [PATCH] qca-qt5: fix devel package conflicts --- srcpkgs/qca-qt5/template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/srcpkgs/qca-qt5/template b/srcpkgs/qca-qt5/template index 3dec828985f..e6eadca5cd8 100644 --- a/srcpkgs/qca-qt5/template +++ b/srcpkgs/qca-qt5/template @@ -1,7 +1,7 @@ # Template file for 'qca' pkgname=qca-qt5 version=2.1.0 -revision=1 +revision=2 wrksrc=${pkgname%-*}-${version} build_style=cmake configure_args="-DBUILD_TESTS=0 -DQCA_FEATURE_INSTALL_DIR=/usr/share/qca/mkspecs -DWITH_ossl_PLUGIN=yes" @@ -21,6 +21,8 @@ replaces="qca>=0" qca-qt5-ossl_package() { depends="${sourcepkg}-${version}_${revision}" short_desc+=" - QCA OSSL plugin" + provides="qca-ossl-${version}_${revision}" + replaces="qca-ossl>=0" pkg_install() { vmove usr/lib/qca/crypto/libqca-ossl.so } @@ -28,6 +30,9 @@ qca-qt5-ossl_package() { qca-qt5-devel_package() { depends="qt5-devel ${sourcepkg}-${version}_${revision}" + short_desc+=" - development files" + provides="qca-devel-${version}_${revision}" + replaces="qca-devel>=0" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig