diff --git a/mjpegtools.spec b/mjpegtools.spec index 7e6c246..da999d1 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -20,7 +20,7 @@ Requires: %{name}-lav = %{version}-%{release} Requires: mencoder # ffmpeg main package, y4mscaler and which for anytovcd.sh Requires: ffmpeg -Requires: y4mscaler +Obsoletes: y4mscaler Requires: which Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -179,6 +179,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Tue Nov 19 2013 Sérgio Basto - 2.1.0-2 +- Fix rfbz #3022, Obsoletes: y4mscaler, because already integrate into + mjpegtools-2.1.0 + * Thu Nov 07 2013 Sérgio Basto - 2.1.0-1 - Update to 2.1.0 - Drop upstreamed patches.