From 5aa15b00707178afa7f7232d3fd51632f3806dc1 Mon Sep 17 00:00:00 2001 From: Ypnose Date: Mon, 4 Nov 2013 13:58:41 +0100 Subject: [PATCH] conky: enable conflict with conky-cli --- srcpkgs/conky/template | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template index e4c146e27ea..f55fc7fd93b 100644 --- a/srcpkgs/conky/template +++ b/srcpkgs/conky/template @@ -1,7 +1,7 @@ # Template file for 'conky' pkgname=conky version=1.9.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-ibm --enable-curl --enable-rss --enable-weather-xoap --enable-imlib2 --disable-lua --enable-wlan" @@ -17,6 +17,8 @@ checksum=1de754d77b2671f68795fdb9fc506328a1668dd6ca00984c3f49790a66d368ca conky_package() { conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf" + provides="conky-${version}" + conflicts="conky>=0" pkg_install() { vmove all }