From 9334b4f763d787deb6a86ab8c2a13357b44ad364 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 24 Feb 2018 13:47:26 -0600 Subject: [PATCH] Conflicts: gstreamer1-plugins-bad-free < 1.13 --- gstreamer1-plugins-base.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gstreamer1-plugins-base.spec b/gstreamer1-plugins-base.spec index 5879ad1..12b1d66 100644 --- a/gstreamer1-plugins-base.spec +++ b/gstreamer1-plugins-base.spec @@ -49,6 +49,9 @@ BuildRequires: gtk-doc >= 1.3 Requires: iso-codes +# libgstgl moved here +Conflicts: gstreamer1-plugins-bad-free < 1.13 + %description GStreamer is a streaming media framework, based on graphs of filters which @@ -454,6 +457,7 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-play-1.0 - update %%files - use %%ldconfig_scriptlets %%make_build %%make_install - %%build: --disable-fatal-warnings --disable-silent-rules +- Conflicts: gstreamer1-plugins-bad-free < 1.13 * Thu Feb 22 2018 Wim Taymans - 1.13.1-1 - Update to 1.13.1