[totem/f14/master] * Fri Aug 06 2010 Bastien Nocera <bnocera at redhat.com> 2.31.6-1 - Rewind to 2.31.6 version

Fri Aug 6 13:58:50 UTC 2010

commit a0a2ff0377c3202c96e8e664c047b190ff0086fd
Author: Bastien Nocera <hadess at hadess.net>
Date:   Fri Aug 6 14:58:39 2010 +0100

    * Fri Aug 06 2010 Bastien Nocera <bnocera at redhat.com> 2.31.6-1
    - Rewind to 2.31.6 version

 .gitignore                          |    1 +
 fix-libpeas-0.5.3-api-changes.patch |   98 -----------------------------------
 sources                             |    2 +-
 totem.spec                          |   54 ++++++-------------
 4 files changed, 19 insertions(+), 136 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index aee0a4b..32ed654 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 totem-2.90.5.tar.bz2
+totem-2.31.6.tar.bz2
diff --git a/sources b/sources
index 637adad..97fc3a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec4799ff71d5e406d307017bbb48fb75  totem-2.90.5.tar.bz2
+10029bf8c7c843224334a66b17b66ee6  totem-2.31.6.tar.bz2
diff --git a/totem.spec b/totem.spec
index b5b6409..e55c260 100644
--- a/totem.spec
+++ b/totem.spec
@@ -3,29 +3,16 @@
 %define gstreamer_plugins_good_version 0.10.18
 %define gstreamer_plugins_bad_free_version 0.10.17
 
-# 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: 5%{?dist}
+Version: 2.31.6
+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 >= 2.14
 Requires(preun): GConf2 >= 2.14
 Requires(post): GConf2 >= 2.14
@@ -54,7 +41,6 @@ BuildRequires: gstreamer-devel >= %gstreamer_version
 BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version
 BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
 BuildRequires: liboil >= 0.3.13-5
-BuildRequires: libpeas-devel
 
 BuildRequires: gcc-c++, pkgconfig, gettext
 BuildRequires: perl(XML::Parser) intltool
@@ -67,8 +53,8 @@ BuildRequires: libXt-devel
 BuildRequires: gnome-doc-utils
 BuildRequires: python-devel pygtk2-devel
 BuildRequires: totem-pl-parser-devel
-BuildRequires: unique-devel
 BuildRequires: GConf2-devel
+BuildRequires: gtk2-devel
 
 # For the nautilus extension
 BuildRequires: nautilus-devel
@@ -85,8 +71,6 @@ BuildRequires: gmyth-devel
 #BuildRequires: tracker-devel
 BuildRequires: libepc-devel
 BuildRequires: libgdata-devel
-BuildRequires: autoconf automake libtool
-BuildRequires: gnome-common
 
 Obsoletes: nautilus-media < 0.8.2
 Provides: nautilus-media = %{version}-%{release}
@@ -113,7 +97,7 @@ The mozilla plugin for Totem allows it to be embedded into a web browser.
 %package lirc
 Summary: LIRC (Infrared remote) plugin for Totem
 Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description lirc
 This package provides a plugin to add LIRC (Infrared remote) support to Totem.
@@ -121,7 +105,7 @@ This package provides a plugin to add LIRC (Infrared remote) support to Totem.
 %package mythtv
 Summary: MythTV plugin for Totem
 Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: gstreamer-plugins-bad-free-extras
 
 %description mythtv
@@ -131,7 +115,7 @@ a remote MythTV server.
 %package youtube
 Summary: YouTube plugin for Totem
 Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description youtube
 This package provides a plugin to allow browsing YouTube videos in Totem,
@@ -143,23 +127,21 @@ available in the Fedora repositories.
 %package jamendo
 Summary: Jamendo plugin for Totem
 Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description jamendo
 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
 Requires: python-Coherence
-Requires: %{name} = %{version}-%{release}
+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
@@ -173,7 +155,7 @@ and watching videos from those.
 %package publish
 Summary: Share your playlist with other Totems on the local network
 Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description publish
 This package provides a plugin to allow you to share your current playlist
@@ -183,7 +165,7 @@ local network.
 %package devel
 Summary: Plugin writer's documentation for totem
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 The %{name}-devel package contains API documentation for
@@ -192,9 +174,9 @@ developing developing plugins for %{name}.
 %package nautilus
 Summary: Video and Audio Properties tab for Nautilus
 Group: Applications/Multimedia
-Requires: %{name} = %{version}-%{release}
-Provides: totem-nautilus-xine = %{version}-%{release}
-Provides: totem-nautilus-gstreamer = %{version}-%{release}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Provides: totem-nautilus-xine = %{epoch}:%{version}-%{release}
+Provides: totem-nautilus-gstreamer = %{epoch}:%{version}-%{release}
 Obsoletes: totem-nautilus-xine < 2.23.0
 Obsoletes: totem-nautilus-gstreamer < 2.23.0
 
@@ -204,9 +186,6 @@ audio and video files in the properties dialog.
 
 %prep
 %setup -q
-%patch0 -p1 -b .fix-libpeas-0.5.3-api-changes
-
-autoreconf -i -f
 
 %build
 
@@ -383,11 +362,9 @@ fi
 %defattr(-, root, root)
 %{_libdir}/totem/plugins/jamendo
 
-%if 0%{with_coherence_upnp}
 %files upnp
 %defattr(-, root, root)
 %{_libdir}/totem/plugins/coherence_upnp
-%endif
 
 %files devel
 %defattr(-, root, root)
@@ -411,6 +388,9 @@ fi
 %{_libdir}/totem/plugins/publish
 
 %changelog
+* Fri Aug 06 2010 Bastien Nocera <bnocera at redhat.com> 2.31.6-1
+- Rewind to 2.31.6 version
+
 * Wed Jul 28 2010 Adam Williamson <awilliam at redhat.com> - 2.90.5-5
 - package various new bits (a shared library, and girepository stuff)
 
