summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxime “pep” Buquet2019-02-24 15:32:56 +0000
committerMaxime “pep” Buquet2019-02-24 15:32:56 +0000
commit15312b70dad207a825373d85d69f621bfd960f7f (patch)
tree243ecc757ad858c88bf1fc55e1397841e7ff942c
parent346a4e8cc9c36ddf6d107c043e4724b362ed7b94 (diff)
downloadaur-15312b70dad207a825373d85d69f621bfd960f7f.tar.gz
Update for upstream release; remove conflicts and provides
conflicts and provides were erroneously set to `python-omemo` (and python2). Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 1 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5fda8ceb9c8d..458692892248 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,8 +17,6 @@ pkgname = python-omemo-syndace
depends = python-doubleratchet
depends = python-x3dh
depends = python-protobuf
- provides = python-omemo
- conflicts = python-omemo
pkgname = python2-omemo-syndace
depends = python2-pynacl
@@ -27,6 +25,4 @@ pkgname = python2-omemo-syndace
depends = python2-doubleratchet
depends = python2-x3dh
depends = python2-protobuf
- provides = python2-omemo
- conflicts = python2-omemo
diff --git a/PKGBUILD b/PKGBUILD
index 02237505c28c..f7f004e2a917 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=python-omemo
_pkgname2=python2-omemo
-_tag=v0.10.4-beta
+_tag=v0.10.5-beta
pkgbase=python-omemo-syndace
pkgname=("python-omemo-syndace" "python2-omemo-syndace")
pkgver=0.10.4.beta
@@ -27,8 +27,6 @@ package_python-omemo-syndace() {
'python-doubleratchet'
'python-x3dh'
'python-protobuf')
- provides=("${_pkgname}")
- conflicts=("${_pkgname}")
cd ${_pkgname}
python3 setup.py install --root="${pkgdir}" --optimize=1
@@ -41,8 +39,6 @@ package_python2-omemo-syndace() {
'python2-doubleratchet'
'python2-x3dh'
'python2-protobuf')
- provides=("${_pkgname2}")
- conflicts=("${_pkgname2}")
cd ${_pkgname}
python2 setup.py install --root="${pkgdir}" --optimize=1