adding a conflict

2 files changed, 4 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bf24e6bd81b7..d40ac42ecac5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -73,6 +73,7 @@ pkgbase = gst-plugins-bad-git
 	provides = gst-plugins-bad=1.18.0.r589.g99ebbf72e
 	conflicts = gst-plugins-bad
 	conflicts = gst-plugins-gl
+	conflicts = gst-plugins-bad-libs
 	options = !emptydirs
 	source = git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-bad.git
 	source = gst-common::git+https://gitlab.freedesktop.org/gstreamer/common.git
@@ -80,3 +81,4 @@ pkgbase = gst-plugins-bad-git
 	sha256sums = SKIP
 
 pkgname = gst-plugins-bad-git
+
diff --git a/PKGBUILD b/PKGBUILD
index 73212e661ece..1e426aa88835 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="GStreamer Multimedia Framework Bad Plugins"
 arch=('i686' 'x86_64')
 license=('LGPL')
 provides=('gst-plugins-bad='$pkgver)
-conflicts=('gst-plugins-bad' 'gst-plugins-gl')
+conflicts=('gst-plugins-bad' 'gst-plugins-gl' 'gst-plugins-bad-libs')
 url="http://gstreamer.freedesktop.org/"
 depends=('mjpegtools' 'gst-plugins-base-git' 'curl'
         'chromaprint' 'libmms' 'faad2' 'mpg123'
@@ -28,7 +28,7 @@ depends=('mjpegtools' 'gst-plugins-base-git' 'curl'
 makedepends=('git' 'meson' 'schroedinger'
              'libexif' 'libdvdread' 'lilv-git'
             'libvdpau' 'libmpeg2'
-            'gtk-doc' 'glu' 'gobject-introspection' )
+            'gtk-doc' 'glu' 'gobject-introspection')
 options=(!emptydirs)
 
 source=('git+https://anongit.freedesktop.org/git/gstreamer/gst-plugins-bad.git'