Merge branch 'f20'

Reset to f20's content
This commit is contained in:
Adam Jackson 2013-10-03 10:49:43 -04:00
commit da089c8c34

View File

@ -9,7 +9,8 @@ License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
Source0: http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-%{version}.tar.xz
Patch0: 0001-missing-plugins-Remove-the-mpegaudioversion-field.patch
Patch1: 0001-playsink-If-the-visualisation-is-changing-and-reconf.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=709210
Patch1: 0001-playsink-If-the-visualisation-is-changing-and-reconf.patch
BuildRequires: gstreamer1-devel >= %{version}
BuildRequires: gobject-introspection-devel >= 1.31.1
@ -90,7 +91,6 @@ for the GStreamer Base Plugins library.
%patch0 -p1
%patch1 -p1
%build
%configure \
--with-package-name='Fedora GStreamer-plugins-base package' \
@ -352,8 +352,8 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gst-discoverer-1.0
%changelog
* Thu Oct 03 2013 Adam Jackson <ajax@redhat.com> 1.2.0-2
- Upstream patch to fix a deadlock
* Thu Oct 03 2013 Bastien Nocera <bnocera@redhat.com> 1.2.0-2
- Fix potential deadlock on startup when playing audio files
* Tue Sep 24 2013 Brian Pepple <bpepple@fedoraproject.org> - 1.2.0-1
- Update to 1.2.0.