rpms/gxine/devel gxine.spec,1.9,1.10

[Martin Sourada (mso)]

Author: mso

Update of /cvs/extras/rpms/gxine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27567

Modified Files:
	gxine.spec 
Log Message:


Clean up Build Requires, prepare for potential usage of mozjs from xulrunner (does not work ATM).




Index: gxine.spec
===================================================================
RCS file: /cvs/extras/rpms/gxine/devel/gxine.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gxine.spec	9 Oct 2007 21:26:42 -0000	1.9
+++ gxine.spec	14 Nov 2007 16:51:08 -0000	1.10
@@ -1,6 +1,8 @@
+%define use_xulrunner_js 0
+
 Name:           gxine
 Version:        0.5.11
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        GTK frontend for the xine multimedia library
 
 Group:          Applications/Multimedia
@@ -12,19 +14,22 @@
 Patch0:         gxine-0.5.8-lirc.patch
 Patch1:         gxine-0.5.11-keep-wnd-state.patch
 
-BuildRequires:  gtk2-devel
-BuildRequires:  xine-lib-devel
-BuildRequires:  gettext
+%if 0%{?use_xulrunner_js}
+BuildRequires:  gecko-devel = 1.9
+%else
 BuildRequires:  js-devel
-# Optional dependencies
-BuildRequires:  libXtst-devel
-BuildRequires:  libXext-devel
-BuildRequires:  lirc-devel
-BuildRequires:  libXinerama-devel
+%endif
+BuildRequires:  gettext
+BuildRequires:  gtk2-devel
+Buildrequires:  xine-lib-devel
+
+# for dbus support
 BuildRequires:  dbus-glib-devel
-BuildRequires:  gnome-screensaver
-BuildRequires:  dbus-devel
-# For Mozilla plugin
+# for LIRC support
+BuildRequires:  lirc-devel
+# for XTest support
+BuildRequires:  libXtst-devel
+# for mozplugin
 BuildRequires:  libXaw-devel
 BuildRequires:  nspr-devel
 
@@ -38,7 +43,7 @@
 Summary:  Mozilla plugin for gxine
 Group:    Applications/Internet
 Requires: %{name} = %{version}-%{release}
-Requires: %{_libdir}/mozilla/plugins
+Requires: xulrunner
 
 %description mozplugin
 This plugin allows gxine to be embedded in a web browser.
@@ -49,11 +54,17 @@
 %patch0 -p1 -b .lirc
 %patch1 -p1 -b .keep-wnd-state
 
+#until jsapi.h and jsstr.h are moved to stable we need this workaround
+%if 0%{?use_xulrunner_js}
+%{__sed} -i 's at jsapi.h@../js/jsapi.h@' src/*.*
+%{__sed} -i 's at jsstr.h@../js/jsstr.h@' src/*.*
+%endif
+
 %{__sed} -i 's/Name=gxine/Name=GXine Video Player/' gxine.desktop
 %{__sed} -i 's/Exec=gxine/Exec=gxine %U/' gxine.desktop
 
 %build
-%configure --with-dbus --with-logo-format=image
+%configure --with-dbus --with-logo-format=image --with-browser-plugin --disable-integration-wizard
 make %{?_smp_mflags}
 
 
@@ -112,6 +123,9 @@
 %{_libdir}/mozilla/plugins/gxineplugin.so
 
 %changelog
+* Wed Nov 14 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-9
+- Clean up the BRs, prepare for usage of mozjs from xulrunner
+
 * Tue Oct 09 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-8
 - Register file handler properly (rhbz #321471)