From 7c8e6ba562db20caed8b7b93da7e04272c71700c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Tue, 19 Nov 2013 21:47:09 +0000
Subject: [PATCH] =?UTF-8?q?*=20Tue=20Nov=2019=202013=20S=C3=A9rgio=20Basto?=
 =?UTF-8?q?=20<sergio@serjux.com>=20-=202.1.0-2=20-=20Fix=20rfbz=20#3022,?=
 =?UTF-8?q?=20Obsoletes:=20y4mscaler,=20because=20already=20integrate=20in?=
 =?UTF-8?q?to=20=20=20mjpegtools-2.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mjpegtools.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 <sergio@serjux.com> - 2.1.0-2
+- Fix rfbz #3022, Obsoletes: y4mscaler, because already integrate into
+  mjpegtools-2.1.0
+
 * Thu Nov 07 2013 Sérgio Basto <sergio@serjux.com> - 2.1.0-1
 - Update to 2.1.0
 - Drop upstreamed patches.