summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorkarlch2021-04-21 10:57:30 +0200
committerkarlch2021-04-21 10:57:30 +0200
commit7d1ec6b87ab2493c2351d22960419fdd6b1b2b0d (patch)
tree37e525b0b16cf12958bb7162259b2f3403954289
parent5e1077d1907a8e4beb3650772cae997a6850b391 (diff)
downloadaur-7d1ec6b87ab2493c2351d22960419fdd6b1b2b0d.tar.gz
Clean up conflicts
As kindly pointed out by @willemw the additional 'vimiv-git' and 'vimiv-qt-git' in conflicts are redundant as all of these packages provide 'vimiv'.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
2 files changed, 2 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1c3c8862a37f..fdb85bfdabae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,8 +14,6 @@ pkgbase = vimiv-qt
optdepends = python-piexif: alternative for exif support
provides = vimiv
conflicts = vimiv
- conflicts = vimiv-git
- conflicts = vimiv-qt-git
source = https://github.com/karlch/vimiv-qt/archive/v0.8.0.tar.gz
sha256sums = 82a268c9a7c254eb1a94f796c1536a74a9fe505da34859803825f22d31c136b6
diff --git a/PKGBUILD b/PKGBUILD
index 929ac5f9c85c..c6a4c16c2103 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Christian Karl <karlch at protonmail dot com>
pkgname=vimiv-qt
-pkgrel=1
+pkgrel=2
pkgver=0.8.0
pkgdesc='An image viewer with vim-like keybindings'
arch=('any')
@@ -15,8 +15,8 @@ optdepends=(
'python-exiv2: for exif support'
'python-piexif: alternative for exif support'
)
-conflicts=('vimiv' 'vimiv-git' 'vimiv-qt-git')
provides=('vimiv')
+conflicts=('vimiv')
source=("${url}/archive/v${pkgver}.tar.gz")
sha256sums=('82a268c9a7c254eb1a94f796c1536a74a9fe505da34859803825f22d31c136b6')