[totem] * Fri Aug 06 2010 Bastien Nocera <bnocera at redhat.com> 2.90.5-6 - Update epoch to match Fedora 14

[Bastien Nocera]

commit d2a5e7c9813c7edacd32d6a322a2e2852d4eca47
Author: Bastien Nocera <hadess at hadess.net>
Date:   Tue Nov 2 16:34:47 2010 +0000

    * Fri Aug 06 2010 Bastien Nocera <bnocera at redhat.com> 2.90.5-6
    - Update epoch to match Fedora 14

 fix-libpeas-0.5.3-api-changes.patch |   98 -----------------------------------
 totem.spec                          |   41 +++++---------
 2 files changed, 15 insertions(+), 124 deletions(-)
---
diff --git a/totem.spec b/totem.spec
index 2fcbd1c..0375db3 100644
--- a/totem.spec
+++ b/totem.spec
@@ -1,30 +1,15 @@
-
-# coherence_upnp currently fails to build in rawhide with:
-#   configure: WARNING: the coherence_upnp plugin uses PyGTK and conflicts with the new pygobject bindings (disabling plugin)
-#
-#  Disable the subpackage for now:
-#
-%global with_coherence_upnp 0
-
 Summary: Movie player for GNOME
 Name: totem
-Version: 2.90.5
-Release: 8%{?dist}
+Version: 2.91.0
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
 Source0: http://download.gnome.org/sources/totem/2.90/totem-%{version}.tar.bz2
 
-# totem does not build against libpeas-devel-0.5.3
-#  missing symbols: peas_plugin_info_{s|g}et_visible
-# Cherrypick fix from totem upstream commit:
-#  http://git.gnome.org/browse/totem/commit/?id=c73bd203eed8b8d1cb45f8746a988d8cda0d408d
-# rhbz#618791
-Patch0: fix-libpeas-0.5.3-api-changes.patch
-
-Requires(pre): GConf2 
-Requires(preun): GConf2 
+Requires(pre): GConf2
+Requires(preun): GConf2
 Requires(post): GConf2
 
 Requires: iso-codes
@@ -38,7 +23,7 @@ Requires: python-httplib2
 Requires: python-BeautifulSoup
 Requires: python-feedparser
 
-Requires: gstreamer 
+Requires: gstreamer
 Requires: gstreamer-plugins-base 
 Requires: gstreamer-plugins-good
 Requires: gstreamer-plugins-bad-free
@@ -137,7 +122,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
 This package provides a plugin to allow browsing the Jamendo music store
 in Totem, and listening to them.
 
-%if 0%{with_coherence_upnp}
 %package upnp
 Summary: UPNP/DLNA plugin for Totem
 Group: Applications/Multimedia
@@ -147,7 +131,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
 %description upnp
 This package provides a plugin to allow browsing UPNP/DLNA shares,
 and watching videos from those.
-%endif
 
 #%package tracker
 #Summary: Tracker-based video search plugin for Totem
@@ -267,10 +250,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %preun mythtv
 %gconf_schema_remove totem-mythtv
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 %post mythtv
 %gconf_schema_upgrade totem-mythtv
 
+%postun
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
@@ -303,13 +290,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/totem/plugins/opensubtitles
 %{_libdir}/totem/plugins/pythonconsole
 %{_libdir}/totem/plugins/screenshot
-#%{_libdir}/totem/plugins/bemused
 %{_datadir}/icons/hicolor/*/apps/totem.png
 %{_datadir}/icons/hicolor/*/devices/totem-tv.png
 %{_datadir}/icons/hicolor/scalable/apps/totem.svg
 %{_datadir}/icons/hicolor/scalable/devices/totem-tv.svg
 %{_mandir}/man1/%{name}.1*
 %{_mandir}/man1/totem-video-thumbnailer.1.gz
+%{_datadir}/GConf/gsettings/*.convert
+%{_datadir}/glib-2.0/schemas/*.xml
 
 %files nautilus
 %defattr(-, root, root,-)
@@ -331,11 +319,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %defattr(-, root, root,-)
 %{_libdir}/totem/plugins/jamendo
 
-%if 0%{with_coherence_upnp}
 %files upnp
 %defattr(-, root, root,-)
-%{_libdir}/totem/plugins/coherence_upnp
-%endif
+#%{_libdir}/totem/plugins/coherence_upnp
 
 %files devel
 %defattr(-, root, root,-)
@@ -359,6 +345,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Tue Nov 02 2010 Bastien Nocera <bnocera at redhat.com> 2.91.0-1
+- Update to 2.91.0
+
 * Fri Sep 24 2010 Parag Nemade <paragn AT fedoraproject.org> 2.90.5-8
 - Merge-review cleanup (#226500)