summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsirlucjan2017-10-26 12:28:59 +0200
committersirlucjan2017-10-26 12:28:59 +0200
commitbcfd9801468bb9016f3a044378c5f40626c5f031 (patch)
tree395a12616b4afc72bd37f13d293d880c6941301c
parente18c8facef5c06ad9cf5a996579d0caaf2a2b8c6 (diff)
downloadaur-bcfd9801468bb9016f3a044378c5f40626c5f031.tar.gz
Update conflicts && provides
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD7
2 files changed, 8 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d4c3b45dc655..3cac6d65e853 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = psi-plus-git
pkgdesc = Psi+ is a powerful Jabber client (Qt, C++) designed for the Jabber power users (built with Qt 5.x)
- pkgver = 1.2.100.0.gbe2588f
+ pkgver = 1.2.105.1.g6e2bdef
pkgrel = 1
url = http://psi-plus.com
arch = i686
@@ -18,11 +18,12 @@ pkgbase = psi-plus-git
depends = aspell
depends = libxss
depends = qt5-svg
- provides = psi-plus
+ provides = psi-plus=1.2.105.1.g6e2bdef
+ provides = psi-plus-qt5-git=1.2.105.1.g6e2bdef
+ conflicts = psi-plus
conflicts = psi-plus-qt5-git
conflicts = psi-plus-webkit-qt5-git
conflicts = psi-plus-webkit-git
- conflicts = psi-plus
source = git://github.com/psi-plus/psi-plus-snapshots
source = git://github.com/psi-plus/main.git
source = conf.diff
diff --git a/PKGBUILD b/PKGBUILD
index 363369e9791c..b7d4bb758d9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
# $Id$
# Maintainer: Piotr Gorski <lucjan.lucjanov@gmail.com>
# Contributor: Sergej Pupykin <arch+pub@sergej.pp.ru>
+# Contributor: Alexey D. <lq07829icatm@rambler.ru>
pkgname=psi-plus-git
-pkgver=1.2.100.0.gbe2588f
+pkgver=1.2.105.1.g6e2bdef
pkgrel=1
pkgdesc="Psi+ is a powerful Jabber client (Qt, C++) designed for the Jabber power users (built with Qt 5.x)"
url="http://psi-plus.com"
@@ -12,8 +13,8 @@ arch=('i686' 'x86_64')
depends=('qt5-base' 'qt5-webkit' 'qt5-multimedia' 'qt5-x11extras' 'qca-qt5'
'libidn' 'aspell' 'libxss' 'qt5-svg')
makedepends=('git' 'patch' 'qconf-git')
-provides=('psi-plus')
-conflicts=('psi-plus-qt5-git' 'psi-plus-webkit-qt5-git' 'psi-plus-webkit-git' 'psi-plus')
+provides=("psi-plus=$pkgver" "psi-plus-qt5-git=$pkgver")
+conflicts=('psi-plus' 'psi-plus-qt5-git' 'psi-plus-webkit-qt5-git' 'psi-plus-webkit-git')
source=("git://github.com/psi-plus/psi-plus-snapshots"
"git://github.com/psi-plus/main.git"
'conf.diff'