summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authoryochananmarqos2019-08-12 08:33:41 -0600
committeryochananmarqos2019-08-12 08:33:41 -0600
commit1cc018f2e2427e6700b865e846aac392f6fcd96b (patch)
tree2c35667296a8d99a59ee5bcf72bb6b9b61f0113d
parentdd983b077c21bcb3174d99e08239a39fd2c1e059 (diff)
downloadaur-1cc018f2e2427e6700b865e846aac392f6fcd96b.tar.gz
adjusted conflicts
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 1 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e0b81558badd..fd5909247daa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,7 +10,6 @@ pkgbase = gst-plugin-viper4linux-git
provides = gst-plugin-viper4linux
provides = gst-plugin-viperfx
conflicts = gst-plugin-viper4linux
- conflicts = gst-plugin-viperfx
replaces = gst-plugin-viperfx
source = git+https://github.com/noahbliss/gst-plugin-viperfx.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 08cb35bee445..d2c8de72f8d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ url="https://github.com/noahbliss/gst-plugin-viperfx"
license=('custom')
depends=('gstreamer' 'libviperfx')
provides=("${pkgname%-git}" "$_gitname")
-conflicts=("${pkgname%-git}" "$_gitname")
+conflicts=("${pkgname%-git}")
replaces=("$_gitname")
source=('git+https://github.com/noahbliss/gst-plugin-viperfx.git')
sha256sums=('SKIP')