summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f69ea9dce5e0..2c44df8304d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = wxpython-phoenix-git
pkgdesc = Python 3 implementation of the WxPython UI library
pkgver = r3413.f04d103b
- pkgrel = 2
+ pkgrel = 3
url = https://github.com/wxWidgets/Phoenix
arch = x86_64
arch = i686
@@ -22,6 +22,7 @@ pkgbase = wxpython-phoenix-git
depends = python
provides = wxpython-phoenix
conflicts = wxpython-phoenix-bin
+ conflicts = python-wxpython
source = wxpython-phoenix-git::git+https://github.com/wxWidgets/Phoenix
source = git+https://github.com/wxWidgets/wxWidgets.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index b3c91a0ceac7..180c715c4b7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=wxpython-phoenix-git
pkgver=r3413.f04d103b
-pkgrel=2
+pkgrel=3
pkgdesc="Python 3 implementation of the WxPython UI library"
arch=('x86_64' 'i686')
url="https://github.com/wxWidgets/Phoenix"
@@ -13,7 +13,7 @@ source=("$pkgname::git+${url}"
"git+https://github.com/wxWidgets/wxWidgets.git")
md5sums=('SKIP' 'SKIP')
provides=('wxpython-phoenix')
-conflicts=('wxpython-phoenix-bin')
+conflicts=('wxpython-phoenix-bin' 'python-wxpython')
pkgver() {
cd "$srcdir/$pkgname"