From 6cc0594532fdfda39a9de1f8552b0026a2a71336 Mon Sep 17 00:00:00 2001 From: Chaoting Liu Date: Wed, 12 Oct 2016 03:49:34 +0100 Subject: [PATCH] libmygpo-qt5: doesnt conflict with its qt4 varient --- libmygpo-qt5/PKGBUILD | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libmygpo-qt5/PKGBUILD b/libmygpo-qt5/PKGBUILD index 50141a601..77853b101 100644 --- a/libmygpo-qt5/PKGBUILD +++ b/libmygpo-qt5/PKGBUILD @@ -4,7 +4,7 @@ pkgname=libmygpo-qt5 _pkgname=libmygpo-qt pkgver=1.0.9 -pkgrel=1 +pkgrel=2 pkgdesc="A C++/Qt client library for gpodder.net" arch=('x86_64') url="http://wiki.gpodder.org/wiki/Libmygpo-qt" @@ -13,11 +13,14 @@ depends=('qt5-base') makedepends=('cmake') source=("http://stefan.derkits.at/files/${_pkgname}/${_pkgname}.${pkgver}.tar.gz") md5sums=('aead5b0c6707f3e2bd2259cb1db2b7cd') -conflicts=('libmygpo-qt') + +prepare() { + cd "${srcdir}" + [[ -e build ]] && rm -rf build + mkdir build +} build() { - cd "${srcdir}" - mkdir build cd build cmake "../${_pkgname}.${pkgver}" \ -DCMAKE_BUILD_TYPE=Release \