summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoost Bremmer2020-05-04 02:35:01 +0200
committerJoost Bremmer2020-05-04 02:35:01 +0200
commit804f39a0b2b805b0603a21ce9bed0b698b543870 (patch)
tree306ecc24f314290bf2e99cb54d4b8dc950e0a29d
parentae71f277bccbeb63d0ea9b259b6283ce9cd86269 (diff)
downloadaur-804f39a0b2b805b0603a21ce9bed0b698b543870.tar.gz
Fix package conflicts
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD4
2 files changed, 5 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d345ea8230a5..099b11269bb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = nvpy
pkgdesc = Simplenote syncing note-taking application, but uglier and cross-platformerer.
pkgver = 2.1.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/cpbotha/nvpy
install = nvpy.install
arch = any
@@ -12,7 +12,8 @@ pkgbase = nvpy
depends = python-setuptools
depends = python-simplenote
depends = tk
- provides = nvpy-git
+ provides = nvpy
+ conflicts = nvpy-git
source = https://github.com/cpbotha/nvpy/archive/v2.1.0.tar.gz
sha256sums = fd045f90660134154474318f7155b2fa0a439c7b00da85800d7d75c4650666e2
diff --git a/PKGBUILD b/PKGBUILD
index e758c0d59e31..6d877ed53e45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Tomas Kral <tomas.kral@gmail.com>
pkgname=nvpy
pkgver=2.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="Simplenote syncing note-taking application, but uglier and cross-platformerer."
arch=("any")
url="https://github.com/cpbotha/nvpy"
@@ -16,7 +16,7 @@ depends=(
"tk"
)
provides=("$pkgname")
-provides=("${pkgname}-git")
+conflicts=("${pkgname}-git")
source=("https://github.com/cpbotha/${pkgname}/archive/v${pkgver}.tar.gz")
install=nvpy.install
sha256sums=('fd045f90660134154474318f7155b2fa0a439c7b00da85800d7d75c4650666e2')