From 939100af45eb13ac12030bafab7e3ec8c9c3d9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 19 Nov 2013 23:43:39 +0000 Subject: [PATCH] =?UTF-8?q?*=20Tue=20Nov=2019=202013=20S=C3=A9rgio=20Basto?= =?UTF-8?q?=20=20-=202.1.0-3=20-=20Better=20obsoletes/p?= =?UTF-8?q?rovides=20for=20y4mscaler.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mjpegtools.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mjpegtools.spec b/mjpegtools.spec index da999d1..e039161 100644 --- a/mjpegtools.spec +++ b/mjpegtools.spec @@ -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: %{name}-lav = %{version}-%{release} 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 @@ rm $RPM_BUILD_ROOT%{_bindir}/mpegtranscode %changelog +* Tue Nov 19 2013 Sérgio Basto - 2.1.0-3 +- Better obsoletes/provides for y4mscaler. + * Tue Nov 19 2013 Sérgio Basto - 2.1.0-2 - Fix rfbz #3022, Obsoletes: y4mscaler, because already integrate into mjpegtools-2.1.0