summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Zou2018-06-13 19:42:14 +0200
committerMichel Zou2018-06-13 19:42:14 +0200
commit7bb8d0116b55eb0d3192475df20492a9aa13226b (patch)
tree5a54efac1e88a0c7d12ecc6abb09c5688231550e
parentd452cc9e591339fad4257ade6421f6902a7c99c2 (diff)
downloadaur-7bb8d0116b55eb0d3192475df20492a9aa13226b.tar.gz
conflicts
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD8
2 files changed, 15 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f52253d3da7..e603597071a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by mksrcinfo v8
-# Mon Jun 11 17:17:57 UTC 2018
+# Wed Jun 13 17:42:13 UTC 2018
pkgbase = pyside2-git
- pkgver = 5.11.0.r5791.f7c82c63
+ pkgver = 5.11.0.r5599.e01afb09
pkgrel = 1
url = http://qt-project.org/wiki/PySide
arch = i686
@@ -34,6 +34,8 @@ pkgbase = pyside2-git
pkgname = pyside2-common-git
pkgdesc = LGPL Qt bindings for Python (Common Files)
+ provides = pyside2-common
+ conflicts = pyside2-common
pkgname = python2-pyside2-git
pkgdesc = LGPL Qt bindings for Python 2
@@ -54,6 +56,8 @@ pkgname = python2-pyside2-git
optdepends = qt5-webengine
optdepends = qt5-webkit
optdepends = qt5-websockets
+ provides = python2-pyside2
+ conflicts = python2-pyside2
pkgname = python-pyside2-git
pkgdesc = LGPL Qt bindings for Python 3
@@ -74,4 +78,6 @@ pkgname = python-pyside2-git
optdepends = qt5-webengine
optdepends = qt5-webkit
optdepends = qt5-websockets
+ provides = python-pyside2
+ conflicts = python-pyside2
diff --git a/PKGBUILD b/PKGBUILD
index bc1db329318..a419512a361 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgbase=pyside2-git
pkgname=(pyside2-common-git python2-pyside2-git python-pyside2-git)
-pkgver=5.11.0.r5791.f7c82c63
+pkgver=5.11.0.r5599.e01afb09
_upver=5.11.0
pkgrel=1
arch=('i686' 'x86_64')
@@ -52,6 +52,8 @@ build() {
package_pyside2-common-git(){
pkgdesc="LGPL Qt bindings for Python (Common Files)"
+ provides=("pyside2-common")
+ conflicts=("pyside2-common")
cd "$srcdir"/$pkgbase/sources/pyside2/build-py3
make DESTDIR="$pkgdir" install
@@ -67,6 +69,8 @@ package_python-pyside2-git(){
optdepends=('qt5-xmlpatterns' 'qt5-tools' 'qt5-multimedia'
'qt5-declarative' 'qt5-script' 'qt5-speech' 'qt5-svg' 'qt5-datavis3d' 'qt5-3d'
'qt5-webchannel' 'qt5-webengine' 'qt5-webkit' 'qt5-websockets')
+ provides=("python-pyside2")
+ conflicts=("python-pyside2")
cd "$srcdir"/$pkgbase/sources/pyside2/build-py3
make DESTDIR="$pkgdir" install
@@ -83,6 +87,8 @@ package_python2-pyside2-git(){
optdepends=('qt5-xmlpatterns' 'qt5-tools' 'qt5-multimedia'
'qt5-declarative' 'qt5-script' 'qt5-speech' 'qt5-svg' 'qt5-datavis3d' 'qt5-3d'
'qt5-webchannel' 'qt5-webengine' 'qt5-webkit' 'qt5-websockets')
+ provides=("python2-pyside2")
+ conflicts=("python2-pyside2")
cd "$srcdir"/$pkgbase/sources/pyside2/build-py2
make DESTDIR="$pkgdir" install