rpms/mjpegtools/devel mjpegtools.spec,1.15,1.16

[Sérgio M. Basto]

Author: sergiomb

Update of /cvs/free/rpms/mjpegtools/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23562

Modified Files:
	mjpegtools.spec 
Log Message:
* Tue Nov 19 2013 Sérgio Basto <sergio at serjux.com> - 2.1.0-2
- Fix rfbz #3022, Obsoletes: y4mscaler, because already integrate into
  mjpegtools-2.1.0



Index: mjpegtools.spec
===================================================================
RCS file: /cvs/free/rpms/mjpegtools/devel/mjpegtools.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- mjpegtools.spec	8 Nov 2013 02:26:27 -0000	1.15
+++ mjpegtools.spec	19 Nov 2013 21:47:09 -0000	1.16
@@ -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:       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 @@
 
 
 %changelog
+* Tue Nov 19 2013 Sérgio Basto <sergio at 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 at serjux.com> - 2.1.0-1
 - Update to 2.1.0
 - Drop upstreamed patches.