Author: sergiomb Update of /cvs/free/rpms/mjpegtools/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26769 Modified Files: mjpegtools.spec Log Message: * Tue Nov 19 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 2.1.0-3 - Better obsoletes/provides for y4mscaler. Index: mjpegtools.spec =================================================================== RCS file: /cvs/free/rpms/mjpegtools/devel/mjpegtools.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- mjpegtools.spec 19 Nov 2013 21:47:09 -0000 1.16 +++ mjpegtools.spec 19 Nov 2013 23:43:39 -0000 1.17 @@ -1,6 +1,6 @@ Name: mjpegtools Version: 2.1.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools to manipulate MPEG data Group: Applications/Multimedia License: GPLv2 @@ -20,7 +20,9 @@ Requires: mencoder # ffmpeg main package, y4mscaler and which for anytovcd.sh Requires: ffmpeg -Obsoletes: y4mscaler +Provides: y4mscaler = 9.0-14 +# Could be dropped on Fedora 22 +Obsoletes: y4mscaler < 9.0-14 Requires: which Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -179,6 +181,9 @@ %changelog +* Tue Nov 19 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 2.1.0-3 +- Better obsoletes/provides for y4mscaler. + * Tue Nov 19 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 2.1.0-2 - Fix rfbz #3022, Obsoletes: y4mscaler, because already integrate into mjpegtools-2.1.0