SPECS: totem.spec - merged deps update and mozilla_firefox bcond s...

[qboosh]

Author: qboosh                       Date: Wed May 24 08:46:04 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged deps update and mozilla_firefox bcond switch from AC-branch

---- Files affected:
SPECS:
   totem.spec (1.82 -> 1.83) 

---- Diffs:

================================================================
Index: SPECS/totem.spec
diff -u SPECS/totem.spec:1.82 SPECS/totem.spec:1.83
--- SPECS/totem.spec:1.82	Wed May 17 20:46:06 2006
+++ SPECS/totem.spec	Wed May 24 10:45:59 2006
@@ -4,13 +4,13 @@
 # - what more bowsers can be supported?
 #
 # Conditional build
-%bcond_with	mozilla_firefox	# build with mozilla-firefox
 %bcond_without	gstreamer	# build with gstreamer instead xine-lib
+%bcond_without	mozilla_firefox	# build with mozilla intead of mozilla-firefox
 %bcond_without	nvtv		# build without nvtv support
 #
 # nvtv only available on few archs
 %ifnarch alpha arm %{ix86} ia64 sh %{x8664}
-%undefine		with_nvtv
+%undefine	with_nvtv
 %endif
 #
 Summary:	Movie player for GNOME 2 based on the gstreamer engine
@@ -30,8 +30,8 @@
 BuildRequires:	GConf2-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	dbus-glib-devel >= 0.35
-BuildRequires:	gnome-desktop-devel
+BuildRequires:	dbus-glib-devel >= 0.60
+BuildRequires:	gnome-desktop-devel >= 2.14.0
 BuildRequires:	gnome-vfs2-devel >= 2.14.0
 BuildRequires:	rpmbuild(macros) >= 1.236
 %if %{with gstreamer}
@@ -49,7 +49,7 @@
 %if %{with mozilla_firefox}
 BuildRequires:	mozilla-firefox-devel
 %else
-BuildRequires:	mozilla-devel >= 5:1.7.12
+BuildRequires:	mozilla-devel >= 5:1.7.13-2
 %endif
 BuildRequires:	nautilus-cd-burner-devel >= 2.14.0
 BuildRequires:	nautilus-devel >= 2.14.0
@@ -109,6 +109,7 @@
 Summary:	Totem shared libraries
 Summary(pl):	Współdzielone biblioteki Totema
 Group:		Libraries
+Requires:	gnome-desktop-libs >= 2.14.0
 Requires:	nautilus-libs >= 2.14.0
 
 %description libs
@@ -183,7 +184,12 @@
 	%{?with_gstreamer:--enable-gstreamer}
 
 %{__make} \
-	MOZILLA_IDLDIR="%{_datadir}/idl"
+%if %{with mozilla_firefox}
+	MOZILLA_IDLDIR="%{_includedir}/mozilla-firefox/idl"
+%else
+	MOZILLA_IDLDIR="%{_includedir}/mozilla/idl"
+%endif
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -294,6 +300,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2006/05/24 08:45:59  qboosh
+- merged deps update and mozilla_firefox bcond switch from AC-branch
+
 Revision 1.82  2006/05/17 18:46:06  patrys
 - up to 1.4.1
 
@@ -342,6 +351,29 @@
 
 Revision 1.73  2005/12/21 21:18:55  patrys
 - up to 1.3.0
+
+Revision 1.72.2.9  2006/05/19 16:06:00  freetz
+- 1.4.1, switched to firefox (epiphany depends on it too),
+  fixed firefox build
+
+Revision 1.72.2.8  2006/05/18 20:27:21  baggins
+- release 5
+- strict reqs
+
+Revision 1.72.2.7  2006/05/17 18:03:35  baggins
+- rel 4
+- build with xine, not gstreamer
+
+Revision 1.72.2.6  2006/05/17 13:07:29  baggins
+- proper mozilla BR
+
+Revision 1.72.2.5  2006/05/17 13:06:48  baggins
+- release 3
+- fixed mozilla idl dir
+
+Revision 1.72.2.4  2006/05/17 12:56:37  baggins
+- merged from HEAD
+- BRs for GNOME 2.14
 
 Revision 1.72  2005/12/11 21:58:15  freetz
 - 1.2.1
================================================================

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