summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Manganiello2021-02-22 22:40:14 +0100
committerFabio Manganiello2021-02-22 22:40:14 +0100
commit5f6f3b68e1cb26d03b59fe4548996b4a782be2d1 (patch)
tree89af3c1121c82b103b6bf438e534bc62300ba76a
parent3e830d58803656ac4a02594294c4fa5ced7f4e3b (diff)
downloadaur-5f6f3b68e1cb26d03b59fe4548996b4a782be2d1.tar.gz
platypush shouldn't actually report explicitly the conflict with platypush-git - only the -git package does
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 2 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 36ca9a5203f7..246d1383f6e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -27,9 +27,8 @@ pkgbase = platypush
optdepends = python-gattlib: Low-energy Bluetooth devices support
optdepends = python-paramiko: SSH support
optdepends = python-pyserial: Arduino/serial device support
- conflicts = platypush-git
options = !strip
- source = platypush-0.13.9.tar.gz::https://git.platypush.tech/platypush/platypush/-/archive/v0.13.9/platypush-v0.13.9.tar.gz
+ source = platypush-v0.13.9.tar.gz::https://git.platypush.tech/platypush/platypush/-/archive/v0.13.9/platypush-v0.13.9.tar.gz
sha512sums = a72bc4e0695a99e92c14d2548f1df3acae9064ae6b4118d617e1bf0cb9a42b532377e76259cadf678bf329cd0d8a9b955d76940018087695b6344f8fd2b683ce
pkgname = platypush
diff --git a/PKGBUILD b/PKGBUILD
index ad378d821663..d484978bba1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,9 +13,8 @@ optdepends=('python-paho-mqtt: MQTT integrations support'
'python-gattlib: Low-energy Bluetooth devices support'
'python-paramiko: SSH support'
'python-pyserial: Arduino/serial device support')
-conflicts=('platypush-git')
options=(!strip)
-source=("${pkgname}-${pkgver}.tar.gz::https://git.platypush.tech/${pkgname}/${pkgname}/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.gz")
+source=("${pkgname}-v${pkgver}.tar.gz::https://git.platypush.tech/${pkgname}/${pkgname}/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.gz")
sha512sums=('a72bc4e0695a99e92c14d2548f1df3acae9064ae6b4118d617e1bf0cb9a42b532377e76259cadf678bf329cd0d8a9b955d76940018087695b6344f8fd2b683ce')
package() {