SPECS: totem.spec - merged from DEVEL

[freetz]

Author: freetz                       Date: Sun Apr  2 13:32:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   totem.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: SPECS/totem.spec
diff -u SPECS/totem.spec:1.75 SPECS/totem.spec:1.76
--- SPECS/totem.spec:1.75	Fri Feb 24 19:05:26 2006
+++ SPECS/totem.spec	Sun Apr  2 15:32:08 2006
@@ -4,8 +4,8 @@
 # - switch to common plugins dir (better known as glen's nsplugins dir ;)
 #
 # Conditional build
-%bcond_with	gstreamer	# build with gstreamer instead xine-lib
 %bcond_with	mozilla_firefox	# build with mozilla-firefox
+%bcond_without	gstreamer	# build with gstreamer instead xine-lib
 %bcond_without	nvtv		# build without nvtv support
 #
 # nvtv only available on few archs
@@ -16,12 +16,12 @@
 Summary:	Movie player for GNOME 2 based on the gstreamer engine
 Summary(pl):	Odtwarzacz filmów dla GNOME 2 oparty na silniku gstreamer
 Name:		totem
-Version:	1.3.1
+Version:	1.4.0
 Release:	1
 License:	GPL
 Group:		Applications/Multimedia
-Source0:	http://ftp.gnome.org/pub/gnome/sources/totem/1.3/%{name}-%{version}.tar.bz2
-# Source0-md5:	3201390ea4a74027e8bab32fa383f4e4
+Source0:	http://ftp.gnome.org/pub/gnome/sources/totem/1.4/%{name}-%{version}.tar.bz2
+# Source0-md5:	34be929fc384b078afabd6d81ab47285
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-idl.patch
 Patch2:		%{name}-mozilla_includes.patch
@@ -29,13 +29,12 @@
 BuildRequires:	GConf2-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	dbus-glib-devel
+BuildRequires:	dbus-glib-devel >= 0.35
 BuildRequires:	gnome-desktop-devel
 BuildRequires:	gnome-vfs2-devel >= 2.12.0
 %if %{with gstreamer}
-BuildRequires:	gstreamer-GConf-devel >= 0.8.11
-BuildRequires:	gstreamer-devel >= 0.8.11
-BuildRequires:	gstreamer-plugins-devel >= 0.8.11
+BuildRequires:	gstreamer-GConf >= 0.10
+BuildRequires:	gstreamer-plugins-base-devel >= 0.8.11
 %endif
 BuildRequires:	gtk+2-devel >= 2:2.8.3
 BuildRequires:	intltool >= 0.34
@@ -57,14 +56,14 @@
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
 %{!?with_gstreamer:BuildRequires:	xine-lib-devel >= 2:1.0.2-1}
+BuildRequires:	xorg-lib-libXv-devel
 Requires(post,preun):	GConf2
 Requires(post,postun):	scrollkeeper
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	gnome-desktop >= 2.12.0
 %if %{with gstreamer}
-Requires:	gstreamer-audiosink >= 0.8.11
-Requires:	gstreamer-colorspace >= 0.8.11
-Requires:	gstreamer-videosink >= 0.8.11
+Requires:	gstreamer-audiosink >= 0.10
+Requires:	gstreamer-videosink >= 0.10
 %else
 Requires:	xine-plugin-video
 %endif
@@ -194,7 +193,6 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/*.{la,a}
 rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla-firefox/plugins/*.{la,a}
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.{la,a}
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
 %find_lang %{name} --all-name --with-gnome
 
@@ -269,6 +267,27 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2006/04/02 13:32:08  freetz
+- merged from DEVEL
+
+Revision 1.73.2.6  2006/03/13 15:04:00  freetz
+- 1.4.0
+
+Revision 1.73.2.5  2006/03/01 07:31:37  freetz
+- 1.3.92
+
+Revision 1.73.2.4  2006/02/22 18:43:39  freetz
+- gstreamer by default for now, xorg deps, rel.2
+
+Revision 1.73.2.3  2006/02/13 10:08:11  freetz
+- 1.3.91, killed xfree86 requirement, xine backend not tested
+
+Revision 1.73.2.2  2006/01/31 15:02:46  freetz
+- fixed gstreamer deps
+
+Revision 1.73.2.1  2006/01/31 02:07:55  patrys
+- up to 1.3.90
+
 Revision 1.75  2006/02/24 18:05:26  aredridel
 - remove XFree86 dependency
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/totem.spec?r1=1.75&r2=1.76&f=u