rpms/totem/devel .cvsignore, 1.74, 1.75 sources, 1.74, 1.75 totem.spec, 1.235, 1.236 totem-bin-backend-ondemand.sh, 1.4, NONE totem-use-pulsesink-volume.patch, 1.5, NONE

Wed May 6 17:54:44 UTC 2009

Author: hadess

Update of /cvs/pkgs/rpms/totem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22184

Modified Files:
	.cvsignore sources totem.spec 
Removed Files:
	totem-bin-backend-ondemand.sh totem-use-pulsesink-volume.patch 
Log Message:
* Wed May 06 2009 Bastien Nocera <bnocera at redhat.com> 2.27.1-1
- Update to 2.27.1
- Remove xine-lib backend


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/.cvsignore,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75

--- .cvsignore	1 Apr 2009 22:18:29 -0000	1.74
+++ .cvsignore	6 May 2009 17:54:14 -0000	1.75
@@ -1 +1 @@
-totem-2.26.1.tar.bz2
+totem-2.27.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/sources,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sources	1 Apr 2009 22:18:30 -0000	1.74
+++ sources	6 May 2009 17:54:14 -0000	1.75
@@ -1 +1 @@
-410d14957f48ae179c03e5c663607536  totem-2.26.1.tar.bz2
+586d08291bdd5e0673baeae0f93ab790  totem-2.27.1.tar.bz2


Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/devel/totem.spec,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -p -r1.235 -r1.236
--- totem.spec	28 Apr 2009 09:42:03 -0000	1.235
+++ totem.spec	6 May 2009 17:54:14 -0000	1.236
@@ -1,22 +1,16 @@
-%define with_xine 1
-
 %define gstreamer_version 0.10.1
 %define gstreamer_plugins_base_version 0.10.17.2-4
 %define gstreamer_plugins_good_version 0.10.0
 %define gstreamer_plugins_flumpegdemux_version 0.10.15
-%define xine_version 1.1.7
 
 Summary: Movie player for GNOME
 Name: totem
-Version: 2.26.1
-Release: 3%{?dist}
+Version: 2.27.1
+Release: 1%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
 Source0: http://download.gnome.org/sources/totem/2.25/totem-%{version}.tar.bz2
-Source1: totem-bin-backend-ondemand.sh
-# Will be removed when we switch to playbin2
-Patch0: totem-use-pulsesink-volume.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Requires(pre): GConf2 >= 2.14
@@ -33,9 +27,6 @@ Requires: gnome-themes
 Requires: pyxdg
 # For all the Python plugins
 Requires: pygtk2
-# FIXME?
-#Requires: %{name}-backend = %{version}-%{release}
-Requires: %{name}-gstreamer
 
 BuildRequires: gcc-c++, pkgconfig, gettext
 BuildRequires: perl(XML::Parser) intltool
@@ -65,6 +56,8 @@ BuildRequires: libepc-devel
 
 Obsoletes: nautilus-media
 Obsoletes: totem-galago
+Obsoletes: totem-gstreamer < 2.27.1
+Obsoletes: totem-xine < 2.27.1
 
 %description
 Totem is simple movie player for the GNOME desktop. It features a
@@ -73,39 +66,6 @@ a pretty complete keyboard navigation.
 
 Totem is extensible through a plugin system.
 
-%package gstreamer
-Summary: Gstreamer backend for Totem
-Group: Applications/Multimedia
-Provides: %{name}-backend = %{version}-%{release}
-Obsoletes: totem-gstreamer < 2.23.0
-Requires: %{name} = %{version}
-Requires: gstreamer >= %gstreamer_version
-Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version
-Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version
-Requires: gstreamer-plugins-flumpegdemux >= %gstreamer_plugins_flumpegdemux_version
-Requires: gvfs-fuse
-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
-
-%description gstreamer
-This package provides the gstreamer backend for the Totem media player.
-
-%if %{with_xine}
-%package xine
-Summary: Xine backend for Totem
-Group: Applications/Multimedia
-Provides: %{name}-backend = %{version}-%{release}
-Requires: %{name} = %{version}
-Requires: xine-lib >= %{xine_version}
-Requires: gvfs-fuse
-BuildRequires: xine-lib-devel >= %{xine_version}
-
-%description xine
-This package provides the xine backend for the Totem media player.
-%endif
-
 %package mozplugin
 Summary: Mozilla plugin for Totem
 Group: Applications/Internet
@@ -134,7 +94,7 @@ a remote MythTV server.
 %package youtube
 Summary: YouTube plugin for Totem
 Group: Applications/Multimedia
-Requires: python-gdata
+Requires: python-gdata gnome-python2-gconf
 Requires: %{name} = %{version}-%{release}
 
 %description youtube
@@ -206,23 +166,10 @@ This package provides a Nautilus extensi
 audio and video files in the properties dialog.
 
 %prep
-%setup -q -c
-pushd totem-%{version}/
-%patch0 -p0 -b .pulsesink-vol
-popd
-# Whatever needs to be changed in both copies do here
-## remember to update me when changing %doc
-for i in AUTHORS COPYING NEWS README TODO;do
-  cp totem-%{version}/$i .
-done
-
-# duplicate sources
-cp -a totem-%{version} xine
-mv totem-%{version} gstreamer
+%setup -q
 
 %build
 
-pushd gstreamer
 # try to work around a problem where gst-inspect does 
 # not find playbin the first time around
 DBUS_FATAL_WARNINGS=0 /usr/bin/gst-inspect-0.10 --print-all > /dev/null
@@ -235,46 +182,13 @@ export MOZILLA_PLUGINDIR=%{_libdir}/mozi
   --disable-nvtv
 
 make %{?_smp_mflags}
-popd
-
-%if %{with_xine}
-# Build the xine-lib backend with minimum dependencies
-pushd xine
-export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins
-%configure \
-  --enable-xine \
-  --disable-gstreamer \
-  --disable-mozilla   \
-  --disable-nautilus  \
-  --disable-scrollkeeper  \
-  --disable-nvtv
-
-cd src/backend/
-make %{?_smp_mflags}
-popd
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-# GSTREAMER INSTALL
-pushd gstreamer/
 make install DESTDIR=$RPM_BUILD_ROOT
-# move the backend library away
-mv $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget.so.0.0.0 $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0
-# language hack
 %find_lang %{name} --with-gnome
-mv %{name}.lang ../
-popd
-
-%if %{with_xine}
-# XINE INSTALL
-pushd xine/src/backend
-make install DESTDIR=$RPM_BUILD_ROOT
-mv $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget.so.0.0.0 $RPM_BUILD_ROOT/%{_libdir}/libbaconvideowidget-xine.so.0.0.0
-popd
-%endif
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/totem/plugins/*/*.{a,la} \
  $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/*.{a,la} \
@@ -285,8 +199,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/totem/p
 
 %find_lang %{name} --with-gnome
 
-install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-backend
-
 # save space by linking identical images in translated docs
 helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
 for f in $helpdir/C/figures/*.png; do
@@ -321,16 +233,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
-%post gstreamer
-/usr/sbin/alternatives --install %{_libdir}/libbaconvideowidget.so.0.0.0 totem-backend %{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0 2
-/sbin/ldconfig
-
-%if %{with_xine}
-%post xine
-/usr/sbin/alternatives --install %{_libdir}/libbaconvideowidget.so.0.0.0 totem-backend %{_libdir}/libbaconvideowidget-xine.so.0.0.0 1
-/sbin/ldconfig
-%endif
-
 %pre
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -359,20 +261,6 @@ if [ -x /usr/bin/gtk-update-icon-cache ]
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
-%postun gstreamer
-if [ "$1" -eq 0 ]; then
-  /usr/sbin/alternatives --remove totem-backend %{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0
-fi
-/sbin/ldconfig
-
-%if %{with_xine}
-%postun xine
-if [ "$1" -eq 0 ]; then
-  /usr/sbin/alternatives --remove totem-backend %{_libdir}/libbaconvideowidget-xine.so.0.0.0
-fi
-/sbin/ldconfig
-%endif
-
 %pre mythtv
 if [ "$1" -gt 1 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -473,15 +361,14 @@ fi
 %defattr(-, root, root)
 %{_libdir}/totem/plugins/publish
 
-%files gstreamer
-%{_libdir}/libbaconvideowidget-gstreamer.so.0.0.0
+%changelog
+* Wed May 06 2009 Bastien Nocera <bnocera at redhat.com> 2.27.1-1
+- Update to 2.27.1
+- Remove xine-lib backend
 
-%if %{with_xine}
-%files xine
-%{_libdir}/libbaconvideowidget-xine.so.0.0.0
-%endif
+* Thu Apr 23 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-4
+- Add missing gnome-python2-gconf req (#483265)
 
-%changelog
 * Tue Apr 28 2009 Bastien Nocera <bnocera at redhat.com> 2.26.1-3
 - Add missing pyxdg requires for the OpenSubtitles plugin (#497787)
 


--- totem-bin-backend-ondemand.sh DELETED ---


--- totem-use-pulsesink-volume.patch DELETED ---


