SPECS (AC-branch): totem.spec - build with xulrunner and browser-p...

Sun Apr 1 20:23:29 CEST 2007

Author: glen                         Date: Sun Apr  1 18:23:29 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- build with xulrunner and browser-plugins v2

---- Files affected:
SPECS:
   totem.spec (1.72.2.20 -> 1.72.2.21) 

---- Diffs:

================================================================
Index: SPECS/totem.spec
diff -u SPECS/totem.spec:1.72.2.20 SPECS/totem.spec:1.72.2.21

--- SPECS/totem.spec:1.72.2.20	Fri Dec  8 15:02:01 2006
+++ SPECS/totem.spec	Sun Apr  1 20:23:24 2007
@@ -1,11 +1,6 @@
 # $Revision$, $Date$
-#
-# TODO:
-# - what more bowsers can be supported?
-#
 # Conditional build
 %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
@@ -17,7 +12,7 @@
 Summary(pl):	Odtwarzacz filmów dla GNOME 2 oparty na silniku gstreamer
 Name:		totem
 Version:	1.4.4
-Release:	4
+Release:	5
 License:	GPL
 Group:		Applications/Multimedia
 Source0:	http://ftp.gnome.org/pub/gnome/sources/totem/1.4/%{name}-%{version}.tar.bz2
@@ -48,15 +43,11 @@
 %{?with_nvtv:BuildRequires:	libnvtvsimple-devel >= 0.4.5}
 BuildRequires:	libtool
 BuildRequires:	lirc-devel
-%if %{with mozilla_firefox}
-BuildRequires:	mozilla-firefox-devel
-%else
-BuildRequires:	mozilla-devel >= 5:1.7.13-2
-%endif
+BuildRequires:	xulrunner-devel
 BuildRequires:	nautilus-cd-burner-devel >= 2.14.0
 BuildRequires:	nautilus-devel >= 2.14.0
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.197
+BuildRequires:	rpmbuild(macros) >= 1.357
 BuildRequires:	scrollkeeper
 %{!?with_gstreamer:BuildRequires:	xine-lib-devel >= 2:1.0.2-1}
 Requires(post,postun):	scrollkeeper
@@ -73,17 +64,8 @@
 Conflicts:	xine-input-gnome-vfs <= 1.1.1
 %endif
 Requires:	gtk+2 >= 2:2.8.3
-%if %{with mozilla_firefox}
-%requires_eq	mozilla-firefox
-%else
-%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_plugindir	%{_libdir}/browser-plugins
-
-# list of supported browsers, in free form text
-%define		browsers	mozilla, mozilla-firefox, netscape, seamonkey
-
 %if %{with gstreamer}
 %description
 Totem is simple movie player for the GNOME desktop based on gstreamer.
@@ -189,11 +171,7 @@
 	%{?with_gstreamer:--enable-gstreamer=0.10}
 
 %{__make} \
-%if %{with mozilla_firefox}
-	MOZILLA_IDLDIR="%{_includedir}/mozilla-firefox/idl"
-%else
-	MOZILLA_IDLDIR="%{_includedir}/mozilla/idl"
-%endif
+	MOZILLA_IDLDIR="%{_includedir}/xulrunner/idl"
 
 
 %install
@@ -201,11 +179,11 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	plugindir=%{_plugindir} \
-	typelibdir=%{_plugindir} \
+	plugindir=%{_browserpluginsdir} \
+	typelibdir=%{_browserpluginsdir} \
 	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
-rm -f $RPM_BUILD_ROOT%{_plugindir}/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_browserpluginsdir}/*.{la,a}
 rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.{la,a}
 
 %find_lang %{name} --all-name --with-gnome
@@ -232,37 +210,13 @@
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%triggerin -n browser-plugin-%{name} -- mozilla
-%nsplugin_install -d %{_libdir}/mozilla/plugins libtotem_mozilla.{so,xpt}
+%post -n browser-plugin-%{name}
+%update_browser_plugins
 
-%triggerun -n browser-plugin-%{name} -- mozilla
-%nsplugin_uninstall -d %{_libdir}/mozilla/plugins libtotem_mozilla.{so,xpt}
-
-%triggerin -n browser-plugin-%{name} -- mozilla-firefox
-%nsplugin_install -d %{_libdir}/mozilla-firefox/plugins libtotem_mozilla.{so,xpt}
-
-%triggerun -n browser-plugin-%{name} -- mozilla-forefox
-%nsplugin_uninstall -d %{_libdir}/mozilla-firefox/plugins libtotem_mozilla.{so,xpt}
-
-%triggerin -n browser-plugin-%{name} -- netscape-common
-%nsplugin_install -d %{_libdir}/netscape/plugins libtotem_mozilla.{so,xpt}
-
-%triggerun -n browser-plugin-%{name} -- netscape-common
-%nsplugin_uninstall -d %{_libdir}/netscape/plugins libtotem_mozilla.{so,xpt}
-
-%triggerin -n browser-plugin-%{name} -- seamonkey
-%nsplugin_install -d %{_libdir}/seamonkey/plugins libtotem_mozilla.{so,xpt}
-
-%triggerun -n browser-plugin-%{name} -- seamonkey
-%nsplugin_uninstall -d %{_libdir}/seamonkey/plugins libtotem_mozilla.{so,xpt}
-
-# as rpm removes the old obsoleted package files after the triggers
-# are ran, add another trigger to make the links there.
-%triggerpostun -n browser-plugin-%{name} -- mozilla-plugin-%{name}
-%nsplugin_install -f -d %{_libdir}/mozilla/plugins libtotem_mozilla.{so,xpt}
-
-%triggerpostun -n browser-plugin-%{name} -- mozilla-firefox-plugin-%{name}
-%nsplugin_install -f -d %{_libdir}/netscape/plugins libtotem_mozilla.{so,xpt}
+%postun -n browser-plugin-%{name}
+if [ "$1" = 0 ]; then
+	%update_browser_plugins
+fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -296,8 +250,8 @@
 %files -n browser-plugin-%{name}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/totem-mozilla-viewer
-%attr(755,root,root) %{_plugindir}/*.so
-%attr(755,root,root) %{_plugindir}/*.xpt
+%attr(755,root,root) %{_browserpluginsdir}/*.so
+%attr(755,root,root) %{_browserpluginsdir}/*.xpt
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -305,6 +259,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72.2.21  2007/04/01 18:23:24  glen
+- build with xulrunner and browser-plugins v2
+
 Revision 1.72.2.20  2006/12/08 14:02:01  glen
 - rel 4 (mozilla-firefox-2.0)
 
================================================================

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

