SPECS: totem.spec - added missing changes from DEVEL: - added cod...

[megabajt]

Author: megabajt                     Date: Mon Sep 17 19:30:07 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added missing changes from DEVEL:
 - added codegen patch and some Suggests (by patrys)
 - added bemused bcond (by aflinta)
- updated deps

---- Files affected:
SPECS:
   totem.spec (1.122 -> 1.123) 

---- Diffs:

================================================================
Index: SPECS/totem.spec
diff -u SPECS/totem.spec:1.122 SPECS/totem.spec:1.123
--- SPECS/totem.spec:1.122	Mon Sep 17 11:19:11 2007
+++ SPECS/totem.spec	Mon Sep 17 21:30:01 2007
@@ -1,7 +1,8 @@
 # $Revision$, $Date$
 #
 # Conditional build
-%bcond_without	gstreamer	# build with gstreamer instead xine-lib
+%bcond_without	bemused		# build without bemused plugin
+%bcond_without	gstreamer	# build with xine-lib instead of gstreamer
 %bcond_without	nvtv		# build without nvtv support
 %bcond_without	lirc		# without lirc support
 #
@@ -22,27 +23,28 @@
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-idl.patch
 Patch2:		%{name}-configure.patch
+Patch3:		%{name}-codegen.patch
 URL:		http://www.gnome.org/projects/totem/
-BuildRequires:	GConf2-devel >= 2.18.0.1
+BuildRequires:	GConf2-devel >= 2.19.1
 BuildRequires:	autoconf
 BuildRequires:	automake
+%{?with_bemused:BuildRequires:	bluez-libs-devel}
 BuildRequires:	dbus-glib-devel >= 0.73
-BuildRequires:	gnome-desktop-devel >= 2.18.1
-BuildRequires:	gnome-vfs2-devel >= 2.18.1
-%if %{with gstreamer}
-BuildRequires:	gstreamer-plugins-base-devel >= 0.10.10
-%endif
-BuildRequires:	gtk+2-devel >= 2:2.10.9
-BuildRequires:	intltool >= 0.35.5
+BuildRequires:	gnome-desktop-devel >= 2.19.92
+BuildRequires:	gnome-vfs2-devel >= 2.20.0
+%{?with_gstreamer:BuildRequires:	gstreamer-plugins-base-devel >= 0.10.10}
+BuildRequires:	gtk+2-devel >= 2:2.12.0
+BuildRequires:	intltool >= 0.36.2
 BuildRequires:	iso-codes
-BuildRequires:	libglade2-devel >= 1:2.6.0
-BuildRequires:	libgnomeui-devel >= 2.18.1
+BuildRequires:	libgalago-devel >= 0.5.2
+BuildRequires:	libglade2-devel >= 1:2.6.2
+BuildRequires:	libgnomeui-devel >= 2.19.1
 BuildRequires:	libmusicbrainz-devel
 %{?with_nvtv:BuildRequires:	libnvtvsimple-devel >= 0.4.5}
 BuildRequires:	libtool
 %{?with_lirc:BuildRequires:	lirc-devel}
-BuildRequires:	nautilus-cd-burner-devel >= 2.18.1
-BuildRequires:	nautilus-devel >= 2.18.1
+BuildRequires:	nautilus-cd-burner-devel >= 2.19.6
+BuildRequires:	nautilus-devel >= 2.19.91
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.357
 BuildRequires:	scrollkeeper
@@ -65,9 +67,12 @@
 # unusable
 Conflicts:	xine-input-gnome-vfs
 %endif
-Requires:	gtk+2 >= 2:2.10.9
-Requires:	nautilus >= 2.18.1
+Requires:	gtk+2 >= 2:2.12.0
+Requires:	nautilus >= 2.19.91
 %requires_eq	xulrunner-libs
+Suggests:	gstreamer-ffmpeg
+Suggests:	gstreamer-mpeg
+Suggests:	gstreamer-pango
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{with gstreamer}
@@ -99,8 +104,8 @@
 Summary:	Totem shared libraries
 Summary(pl.UTF-8):	Współdzielone biblioteki Totema
 Group:		Libraries
-Requires:	gnome-desktop-libs >= 2.18.1
-Requires:	nautilus-libs >= 2.18.1
+Requires:	gnome-desktop-libs >= 2.19.92
+Requires:	nautilus-libs >= 2.19.91
 
 %description libs
 Totem shared libraries.
@@ -113,7 +118,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe Totema
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gtk+2-devel >= 2:2.10.9
+Requires:	gtk+2-devel >= 2:2.12.0
 
 %description devel
 Totem headers files.
@@ -156,6 +161,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__intltoolize}
@@ -180,13 +186,14 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	plugindir=%{_browserpluginsdir} \
+	MOZILLA_PLUGINDIR=%{_browserpluginsdir} \
 	typelibdir=%{_browserpluginsdir} \
 	xptdir=%{_browserpluginsdir} \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 rm -f $RPM_BUILD_ROOT%{_browserpluginsdir}/*.{la,a}
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/totem/plugins/*/*.{la,a}
 
 %find_lang %{name} --all-name --with-gnome
 
@@ -235,10 +242,24 @@
 %{_mandir}/man1/totem-video-thumbnailer.1*
 %{_omf_dest_dir}/%{name}
 %{_iconsdir}/hicolor/*/*/totem.*
-%{_pixmapsdir}/vanity.png
+#%{_pixmapsdir}/vanity.png
 %{_sysconfdir}/gconf/schemas/totem-handlers.schemas
 %{_sysconfdir}/gconf/schemas/totem-video-thumbnail.schemas
 %{_sysconfdir}/gconf/schemas/totem.schemas
+%dir %{_libdir}/totem
+%dir %{_libdir}/totem/plugins
+%{?with_bemused:%dir %{_libdir}/totem/plugins/bemused}
+%dir %{_libdir}/totem/plugins/galago
+%dir %{_libdir}/totem/plugins/gromit
+%dir %{_libdir}/totem/plugins/lirc
+%dir %{_libdir}/totem/plugins/media-player-keys
+%dir %{_libdir}/totem/plugins/ontop
+%dir %{_libdir}/totem/plugins/properties
+%dir %{_libdir}/totem/plugins/screensaver
+%dir %{_libdir}/totem/plugins/skipto
+%attr(755,root,root) %{_libdir}/totem/plugins/*/*.so
+%{_libdir}/totem/plugins/*/*.totem-plugin
+%{_libdir}/totem/plugins/*/*.ui
 
 %files libs
 %defattr(644,root,root,755)
@@ -267,6 +288,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.123  2007/09/17 19:30:01  megabajt
+- added missing changes from DEVEL:
+ - added codegen patch and some Suggests (by patrys)
+ - added bemused bcond (by aflinta)
+- updated deps
+
 Revision 1.122  2007/09/17 09:19:11  patrys
 - 2.20.0
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/totem.spec?r1=1.122&r2=1.123&f=u