Fix merge errors

.gitignore

@@ -4,3 +4,4 @@
 /gst-plugins-good-1.0.0.tar.xz
 /gst-plugins-good-1.0.1.tar.xz
 /gst-plugins-good-1.0.2.tar.xz
+/gst-plugins-good-1.0.3.tar.xz

gstreamer1-plugins-good.spec

@@ -8,16 +8,13 @@
 %endif
 
 Name:           gstreamer1-plugins-good
-Version:        1.0.2
+Version:        1.0.3
-Release:        3%{?dist}
+Release:        1%{?dist}
 Summary:        GStreamer plugins with good code and licensing
 
 License:        LGPLv2+
 URL:            http://gstreamer.freedesktop.org/
 Source0:        http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.xz
-Patch0:         0001-vp8dec-Short-circuit-gst_vp8_dec_handle_frame-if-key.patch
-Patch1:         0002-vp8dec-Immediately-return-if-opening-the-decoder-fai.patch
-Patch2:         0001-speexdec-Don-t-unmap-or-finish_frame-an-invalid-GstB.patch
 Patch3:         0001-v4l2src-Check-for-obj-pool-NULL.patch
 
 BuildRequires:  gstreamer1-devel >= %{version}
@@ -87,9 +84,6 @@ to be installed.
 
 %prep
 %setup -q -n gst-plugins-good-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 %patch3 -p1
 
 
@@ -207,6 +201,11 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Wed Nov 21 2012 Brian Pepple <bpepple@fedoraproject.org> - 1.0.3-1
+- Update to 1.0.3
+- Drop speexdec patch. Fixed upstream.
+- Drop vp8 patches. Fixed upstream.
+
 * Wed Nov  7 2012 Debarshi Ray <rishi@fedoraproject.org> - 1.0.2-3
 - Fixes for GNOME #687464 and #687793
 

sources

@@ -1 +1 @@
-13e487127d80fe20c868b3bbb2a17d9e  gst-plugins-good-1.0.2.tar.xz
+5cfc3f18dede15d60f0af8666f68193e  gst-plugins-good-1.0.3.tar.xz