don’t conflict pythonqt in general to allow parallel python2 and python3 version installs

2 files changed, 6 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4558ab784625..19a3a2357b8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Oct 20 13:55:37 UTC 2016
+# Thu Dec 15 21:06:43 UTC 2016
 pkgbase = qt5-python27-git
 	pkgdesc = PythonQt fork featuring Qt 5.x and Python 3.x support and improved CMake build system (Qt5 and Python2.7 version)
-	pkgver = 3.1+96.gbe06218
-	pkgrel = 4
+	pkgver = 3.1+105.gfd8413c
+	pkgrel = 1
 	url = https://github.com/knossos-project/PythonQt
 	arch = x86_64
 	license = LGPL
@@ -17,8 +17,6 @@ pkgbase = qt5-python27-git
 	depends = qt5-multimedia
 	depends = qt5-svg
 	provides = qt5-python27
-	provides = pythonqt
-	conflicts = pythonqt
 	replaces = qt5-python26
 	source = git+https://github.com/knossos-project/PythonQt.git
 	source = qmetaobjectbuilder_p.h::http://code.qt.io/cgit/qt/qtbase.git/plain/src/corelib/kernel/qmetaobjectbuilder_p.h?h=v5.7.0
diff --git a/PKGBUILD b/PKGBUILD
index 269350251c2b..99bc6b53c98e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname="qt5-python27-git"
 _qtver=5.7.0
-pkgver=3.1+96.gbe06218
-pkgrel=4
+pkgver=3.1+105.gfd8413c
+pkgrel=1
 arch=("x86_64")
 pkgdesc="PythonQt fork featuring Qt 5.x and Python 3.x support and improved CMake build system (Qt5 and Python2.7 version)"
 license=("LGPL")
@@ -19,10 +19,7 @@ depends=("python2"
   "qt5-multimedia"
   "qt5-svg"
 )
-provides=("qt5-python27"
-  "pythonqt"
-)
-conflicts=("pythonqt")
+provides=("qt5-python27")
 replaces=("qt5-python26") # conflicting older versions is the idea
 source=("git+https://github.com/knossos-project/PythonQt.git"
   "qmetaobjectbuilder_p.h::http://code.qt.io/cgit/qt/qtbase.git/plain/src/corelib/kernel/qmetaobjectbuilder_p.h?h=v$_qtver")