rpms/gxine/EL-5 gxine.spec,1.4,1.5

Martin Sourada (mso) fedora-extras-commits at redhat.com
Mon Dec 10 19:29:40 UTC 2007


Author: mso

Update of /cvs/extras/rpms/gxine/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17679/EL-5

Modified Files:
	gxine.spec 
Log Message:


Drop support for lirc in EPEL, use firefox-js in EPEL (neither xulrunner, nor js available), use js in F8 (xulrunner not available).




Index: gxine.spec
===================================================================
RCS file: /cvs/extras/rpms/gxine/EL-5/gxine.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gxine.spec	10 Dec 2007 18:20:26 -0000	1.4
+++ gxine.spec	10 Dec 2007 19:29:06 -0000	1.5
@@ -1,16 +1,23 @@
-%if 0%{?fedora} >= 8
+%if 0%{?fedora} > 8
   %define use_xulrunner_js 1
   %define gecko_dev_ver 1.9
   %define gecko_libs_ver %{gecko_dev_ver}b2pre
 %else
   %define use_xulrunner_js 0
+  %if 0%{?el5}
+    %define use_firefox_js 1
+    %define gecko_dev_ver 1.8.0.12
+    %define gecko_libs_ver %{gecko_dev_ver}
+  %else
+    %define use_firefox_js 0
+  %endif
 %endif
 
 
 
 Name:           gxine
 Version:        0.5.11
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        GTK frontend for the xine multimedia library
 
 Group:          Applications/Multimedia
@@ -23,7 +30,7 @@
 Patch1:         gxine-0.5.11-keep-wnd-state.patch
 
 
-%if 0%{?use_xulrunner_js}
+%if 0%{?use_xulrunner_js}%{?use_firefox_js}
 BuildRequires:  gecko-devel = %{gecko_dev_ver}
 %else
 BuildRequires:  js-devel
@@ -35,15 +42,17 @@
 
 # for dbus support
 BuildRequires:  dbus-glib-devel
-# for LIRC support
+# for LIRC support (not available only for fedora)
+%if 0%{?fedora}
 BuildRequires:  lirc-devel
+%endif
 # for XTest support
 BuildRequires:  libXtst-devel
 # for mozplugin
 BuildRequires:  libXaw-devel
 BuildRequires:  nspr-devel
 
-%if 0%{?use_xulrunner_js}
+%if 0%{?use_xulrunner_js}%{?use_firefox_js}
 Requires:       gecko-libs = %{gecko_libs_ver}
 %endif
 
@@ -60,8 +69,12 @@
 %if 0%{?use_xulrunner_js}
 Requires: xulrunner
 %else
+%if 0%{?use_firefox_js}
+Requires: firefox
+%else
 Requires: %{_libdir}/mozilla/plugins
 %endif
+%endif
 
 %description mozplugin
 This plugin allows gxine to be embedded in a web browser.
@@ -134,6 +147,10 @@
 %{_libdir}/mozilla/plugins/gxineplugin.so
 
 %changelog
+* Mon Dec 10 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-14
+- xulrunner not available on F-8 (use js)
+- js and lirc not available on EL-5 (use firefox-js and drop lirc support)
+
 * Mon Dec 10 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-13
 - spec cleanup
 - prepare for EPEL




More information about the fedora-extras-commits mailing list