rpms/gxine/F-9 gxine.spec,1.23,1.24

[Martin Sourada (mso)]

Author: mso

Update of /cvs/extras/rpms/gxine/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9919

Modified Files:
	gxine.spec 
Log Message:


Rebuild for new xulrunner.




Index: gxine.spec
===================================================================
RCS file: /cvs/extras/rpms/gxine/F-9/gxine.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- gxine.spec	9 Feb 2008 12:36:17 -0000	1.23
+++ gxine.spec	18 Jul 2008 19:59:01 -0000	1.24
@@ -1,23 +1,6 @@
-%if 0%{?fedora} > 8
-  %define use_xulrunner_js 1
-  %define gecko_dev_ver 1.9
-  %define gecko_libs_ver %{gecko_dev_ver}
-%else
-  %define use_xulrunner_js 0
-  %if 0%{?rhel} == 5
-    %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:        17%{?dist}
+Release:        18%{?dist}
 Summary:        GTK frontend for the xine multimedia library
 
 Group:          Applications/Multimedia
@@ -31,11 +14,7 @@
 Patch2:         gxine-0.5.11-xine-version-check.patch
 
 
-%if 0%{?use_xulrunner_js}%{?use_firefox_js}
-BuildRequires:  gecko-devel = %{gecko_dev_ver}
-%else
-BuildRequires:  js-devel
-%endif
+BuildRequires:  gecko-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gtk2-devel
@@ -43,20 +22,14 @@
 
 # for dbus support
 BuildRequires:  dbus-glib-devel
-# for LIRC support (not available only for fedora)
-%if 0%{?fedora}
+# for LIRC support (available only for fedora)
 BuildRequires:  lirc-devel
-%endif
 # for XTest support
 BuildRequires:  libXtst-devel
 # for mozplugin
 BuildRequires:  libXaw-devel
 BuildRequires:  nspr-devel
 
-%if 0%{?use_xulrunner_js}%{?use_firefox_js}
-Requires:       gecko-libs = %{gecko_libs_ver}
-%endif
-
 %description
 gxine is a fully-featured free audio/video player for unix-like systems which
 uses libxine for audio/video decoding and playback. For more informations on
@@ -67,15 +40,7 @@
 Summary:  Mozilla plugin for gxine
 Group:    Applications/Internet
 Requires: %{name} = %{version}-%{release}
-%if 0%{?use_xulrunner_js}
-Requires: xulrunner
-%else
-%if 0%{?use_firefox_js}
-Requires: firefox
-%else
-Requires: %{_libdir}/mozilla/plugins
-%endif
-%endif
+Requires: mozilla-filesystem
 
 %description mozplugin
 This plugin allows gxine to be embedded in a web browser.
@@ -107,11 +72,7 @@
 mkdir -p %{buildroot}%{_libdir}/mozilla/plugins/
 mv %{buildroot}%{_libdir}/gxine/gxineplugin.so %{buildroot}%{_libdir}/mozilla/plugins/
 # Not supported yet - check bz #213041
-%if 0%{?fedora} >= 8
 %find_lang %{name} --all-name
-%else
-/usr/lib/rpm/find-lang.sh %{buildroot} %{name} --all-name
-%endif
 
 desktop-file-install --vendor="fedora" --delete-original \
   --dir %{buildroot}%{_datadir}/applications             \
@@ -152,6 +113,11 @@
 %{_libdir}/mozilla/plugins/gxineplugin.so
 
 %changelog
+* Fri Jul 18 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.11-18
+- rebuild for new xulrunner
+- drop versioned dependency on gecko (we are using only stable API)
+- drop dist conditionals to keep the spec cleaner
+
 * Sat Feb 09 2008 Martin Sourada <martin.sourada at gmail.com> - 0.5.11-17
 - add patch to support x.y.z.w version strings in xine-lib