From ec2418746a82535a1a289e10a758fae985d11bb9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 20 May 2019 06:58:20 -0500 Subject: [PATCH] Conflicts: gstreamer1-plugins-ugly < 1.16.0-2 when mpeg2dec was moved here from -ugly --- gstreamer1-plugins-ugly-free.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gstreamer1-plugins-ugly-free.spec b/gstreamer1-plugins-ugly-free.spec index ef643ab..a27b5bb 100644 --- a/gstreamer1-plugins-ugly-free.spec +++ b/gstreamer1-plugins-ugly-free.spec @@ -6,7 +6,7 @@ Name: gstreamer1-plugins-ugly-free Version: 1.16.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GStreamer streaming media framework "ugly" plugins License: LGPLv2+ and LGPLv2 @@ -36,6 +36,9 @@ BuildRequires: libcdio-devel BuildRequires: libdvdread-devel BuildRequires: libmpeg2-devel +# when mpeg2dec was moved here from -ugly +Conflicts: gstreamer1-plugins-ugly < 1.16.0-2 + %description GStreamer is a streaming media framework, based on graphs of elements which operate on media data. @@ -142,6 +145,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Mon May 20 2019 Rex Dieter - 1.16.0-3 +- Conflicts: gstreamer1-plugins-ugly < 1.16.0-2 + * Mon May 13 2019 Yaakov Selkowitz - 1.16.0-2 - Enable mpeg2dec plugin (#1709470)