packages: gstreamer-plugins-bad/gstreamer-plugins-bad.spec - fix build agia...

[adamg]

Author: adamg                        Date: Sun Feb 12 23:01:25 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build agianst mjpegtools-2.0.0 (-mjpegtools200.patch)
- BC: mjpegtools-devel-2.0.0-1
- release 9 (rebuild against libpng-1.5)

---- Files affected:
packages/gstreamer-plugins-bad:
   gstreamer-plugins-bad.spec (1.100 -> 1.101) 

---- Diffs:

================================================================
Index: packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec
diff -u packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec:1.100 packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec:1.101
--- packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec:1.100	Sun Feb 12 09:19:26 2012
+++ packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec	Mon Feb 13 00:01:20 2012
@@ -32,7 +32,7 @@
 Summary(pl.UTF-8):	Złe wtyczki do środowiska obróbki strumieni GStreamer
 Name:		gstreamer-plugins-bad
 Version:	0.10.22
-Release:	8
+Release:	9
 License:	LGPL v2+
 Group:		Libraries
 Source0:	http://gstreamer.freedesktop.org/src/gst-plugins-bad/%{gstname}-%{version}.tar.bz2
@@ -44,6 +44,7 @@
 Patch4:		%{name}-timidity.patch
 Patch5:		%{name}-nas.patch
 Patch6:		%{name}-modplug_stereofix.patch
+Patch7:		%{name}-mjpegtools200.patch
 URL:		http://gstreamer.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.10
@@ -134,6 +135,7 @@
 BuildRequires:	xorg-lib-libX11-devel
 %{?with_xvid:BuildRequires:	xvid-devel >= 1.0.0}
 BuildRequires:	zbar-devel >= 0.9
+BuildConflicts:	mjpegtools-devel-2.0.0-1
 Requires:	glib2 >= 1:2.22
 Requires:	gstreamer >= %{gst_req_ver}
 Requires:	gstreamer-plugins-base >= %{gstpb_req_ver}
@@ -738,6 +740,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 %{__libtoolize}
@@ -1140,6 +1143,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.101  2012/02/12 23:01:20  adamg
+- fix build agianst mjpegtools-2.0.0 (-mjpegtools200.patch)
+- BC: mjpegtools-devel-2.0.0-1
+- release 9 (rebuild against libpng-1.5)
+
 Revision 1.100  2012/02/12 08:19:26  arekm
 - release 8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gstreamer-plugins-bad/gstreamer-plugins-bad.spec?r1=1.100&r2=1.101&f=u