SPECS (AC-branch): totem.spec - 1.4.1, switched to firefox (epipha...

[freetz]

Author: freetz                       Date: Fri May 19 16:06:06 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 1.4.1, switched to firefox (epiphany depends on it too),
  fixed firefox build

---- Files affected:
SPECS:
   totem.spec (1.72.2.8 -> 1.72.2.9) 

---- Diffs:

================================================================
Index: SPECS/totem.spec
diff -u SPECS/totem.spec:1.72.2.8 SPECS/totem.spec:1.72.2.9
--- SPECS/totem.spec:1.72.2.8	Thu May 18 22:27:21 2006
+++ SPECS/totem.spec	Fri May 19 18:06:00 2006
@@ -4,24 +4,24 @@
 # - what more bowsers can be supported?
 #
 # Conditional build
-%bcond_with	mozilla_firefox	# build with mozilla-firefox
 %bcond_with	gstreamer	# build with gstreamer instead xine-lib
+%bcond_without	mozilla_firefox	# build with 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
 Summary(pl):	Odtwarzacz filmów dla GNOME 2 oparty na silniku gstreamer
 Name:		totem
-Version:	1.4.0
-Release:	5
+Version:	1.4.1
+Release:	1
 License:	GPL
 Group:		Applications/Multimedia
 Source0:	http://ftp.gnome.org/pub/gnome/sources/totem/1.4/%{name}-%{version}.tar.bz2
-# Source0-md5:	34be929fc384b078afabd6d81ab47285
+# Source0-md5:	6788b83f7889f61eef5922f4daecd859
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-idl.patch
 Patch2:		%{name}-mozilla_includes.patch
@@ -185,7 +185,12 @@
 	%{?with_gstreamer:--enable-gstreamer}
 
 %{__make} \
+%if %{with mozilla_firefox}
+	MOZILLA_IDLDIR="%{_includedir}/mozilla-firefox/idl"
+%else
 	MOZILLA_IDLDIR="%{_includedir}/mozilla/idl"
+%endif
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -296,6 +301,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
================================================================

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