[gstreamer-plugins-good] Revert "Update to 0.11.92"
Brian Pepple
bpepple at fedoraproject.org
Tue Jul 17 17:58:02 UTC 2012
commit 42890ec28e7f139617932c63e215471bdb2babd6
Author: Brian Pepple <bpepple at fedoraproject.org>
Date: Tue Jul 17 13:55:50 2012 -0400
Revert "Update to 0.11.92"
This reverts commit e141f790af16a29e1c4afefe713b661dd8d3fc27.
.gitignore | 1 -
gstreamer-plugins-good.spec | 59 +++++++++++++++++++++++++++++-------------
sources | 2 +-
3 files changed, 42 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 92befed..48fe863 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
/gst-plugins-good-0.10.29.tar.bz2
/gst-plugins-good-0.10.30.tar.xz
/gst-plugins-good-0.10.31.tar.xz
-/gst-plugins-good-0.11.92.tar.xz
diff --git a/gstreamer-plugins-good.spec b/gstreamer-plugins-good.spec
index ea4ea09..6b36aa9 100644
--- a/gstreamer-plugins-good.spec
+++ b/gstreamer-plugins-good.spec
@@ -1,7 +1,7 @@
%define gstreamer gstreamer
-%define majorminor 1.0
+%define majorminor 0.10
-%define _gst 0.11.92
+%define _gst 0.10.36
%define _gstpb %{_gst}
# Turn of extras package on RHEL.
@@ -12,21 +12,22 @@
%endif
Name: %{gstreamer}-plugins-good
-Version: 0.11.92
-Release: 1%{?dist}
+Version: 0.10.31
+Release: 4%{?dist}
Summary: GStreamer plug-ins with good code and licensing
Group: Applications/Multimedia
License: LGPLv2+
URL: http://gstreamer.freedesktop.org/
+#Source: http://gstreamer.freedesktop.org/src/gst-plugins-good/pre/gst-plugins-good-%{version}.tar.xz
Source: http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-%{version}.tar.xz
# Cherry picks from upstream git which hopefully fix rhbz#815581
-#Patch1: 0001-fix-v4l2_munmap.patch
-#Patch2: 0002-clear_DISCONT_flag.patch
+Patch1: 0001-fix-v4l2_munmap.patch
+Patch2: 0002-clear_DISCONT_flag.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=677516
-#Patch3: 0003-v4l2src-fix.patch
+Patch3: 0003-v4l2src-fix.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=677722
-#Patch4: 0004-v4l2object-Don-t-probe-UVC-devices-for-being-interla.patch
+Patch4: 0004-v4l2object-Don-t-probe-UVC-devices-for-being-interla.patch
Requires: %{gstreamer} >= %{_gst}
Requires(pre): GConf2
@@ -44,7 +45,7 @@ BuildRequires: gettext
BuildRequires: gcc-c++
BuildRequires: cairo-devel
-BuildRequires: flac-devel >= 1.1.4
+BuildRequires: flac-devel >= 1.1.3
BuildRequires: GConf2-devel
BuildRequires: glibc-devel
BuildRequires: gtk2-devel
@@ -137,10 +138,10 @@ which are not used very much and require additional libraries to be installed.
%prep
%setup -q -n gst-plugins-good-%{version}
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-#%patch4 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
@@ -152,6 +153,7 @@ which are not used very much and require additional libraries to be installed.
--enable-orc \
--disable-monoscope \
--disable-aalib \
+ --disable-esd \
--disable-libcaca \
%if %{with extras}
--enable-jack \
@@ -188,6 +190,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/gstreamer-%{majorminor}/libgstalaw.so
%{_libdir}/gstreamer-%{majorminor}/libgstalphacolor.so
%{_libdir}/gstreamer-%{majorminor}/libgstalpha.so
+%{_libdir}/gstreamer-%{majorminor}/libgstannodex.so
%{_libdir}/gstreamer-%{majorminor}/libgstapetag.so
%{_libdir}/gstreamer-%{majorminor}/libgstaudiofx.so
%{_libdir}/gstreamer-%{majorminor}/libgstaudioparsers.so
@@ -196,6 +199,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/gstreamer-%{majorminor}/libgstavi.so
%{_libdir}/gstreamer-%{majorminor}/libgstcutter.so
%{_libdir}/gstreamer-%{majorminor}/libgstdebug.so
+%{_libdir}/gstreamer-%{majorminor}/libgstdeinterlace.so
+%{_libdir}/gstreamer-%{majorminor}/libgstefence.so
%{_libdir}/gstreamer-%{majorminor}/libgsteffectv.so
%{_libdir}/gstreamer-%{majorminor}/libgstequalizer.so
%{_libdir}/gstreamer-%{majorminor}/libgstflv.so
@@ -231,7 +236,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/gstreamer-%{majorminor}/libgsty4menc.so
# gstreamer-plugins with external dependencies but in the main package
+%{_libdir}/gstreamer-%{majorminor}/libgstcairo.so
%{_libdir}/gstreamer-%{majorminor}/libgstflac.so
+%{_libdir}/gstreamer-%{majorminor}/libgstgconfelements.so
+%{_libdir}/gstreamer-%{majorminor}/libgstgdkpixbuf.so
%{_libdir}/gstreamer-%{majorminor}/libgstjpeg.so
%{_libdir}/gstreamer-%{majorminor}/libgstossaudio.so
%{_libdir}/gstreamer-%{majorminor}/libgstpng.so
@@ -249,6 +257,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/gstreamer-%{majorminor}/libgst1394.so
%endif
+## Libraries
+
+# schema files
+%{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas
+
%files devel-docs
%defattr(-, root, root)
@@ -262,13 +275,23 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_libdir}/gstreamer-%{majorminor}/libgstjack.so
%endif
+%pre
+if [ "$1" -gt 1 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
+fi
-%changelog
-* Sat Jul 14 2012 Brian Pepple <bpepple at fedoraproject.org> - 0.11.92-1
-- Update to 0.11.92
-- Update file list for gst-1.0.
-- Bump minimum version of flac needed.
+%preun
+if [ "$1" -eq 0 ]; then
+ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
+fi
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null || :
+
+%changelog
* Mon Jun 11 2012 Nils Philippsen <nils at redhat.com> - 0.10.31-4
- add extras subpackage with jack source/sink (#714481)
diff --git a/sources b/sources
index 59dd585..ce50b25 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b4b8fc850f406034a32bb01f6c4f6bed gst-plugins-good-0.11.92.tar.xz
+555845ceab722e517040bab57f9ace95 gst-plugins-good-0.10.31.tar.xz
More information about the scm-commits
mailing list