rpms/gxine/F-8 gxine.spec,1.9,1.10

[Martin Sourada (mso)]

Author: mso

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

Modified Files:
	gxine.spec 
Log Message:


Cleanup spec, prepare for EPEL.



Index: gxine.spec
===================================================================
RCS file: /cvs/extras/rpms/gxine/F-8/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	10 Dec 2007 18:20:39 -0000	1.10
@@ -1,6 +1,16 @@
+%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
+%endif
+
+
+
 Name:           gxine
 Version:        0.5.11
-Release:        8%{?dist}
+Release:        13%{?dist}
 Summary:        GTK frontend for the xine multimedia library
 
 Group:          Applications/Multimedia
@@ -12,22 +22,31 @@
 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 = %{gecko_dev_ver}
+%else
 BuildRequires:  js-devel
-# Optional dependencies
-BuildRequires:  libXtst-devel
-BuildRequires:  libXext-devel
-BuildRequires:  lirc-devel
-BuildRequires:  libXinerama-devel
+%endif
+BuildRequires:  desktop-file-utils
+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
 
+%if 0%{?use_xulrunner_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
@@ -38,7 +57,11 @@
 Summary:  Mozilla plugin for gxine
 Group:    Applications/Internet
 Requires: %{name} = %{version}-%{release}
+%if 0%{?use_xulrunner_js}
+Requires: xulrunner
+%else
 Requires: %{_libdir}/mozilla/plugins
+%endif
 
 %description mozplugin
 This plugin allows gxine to be embedded in a web browser.
@@ -53,15 +76,14 @@
 %{__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}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-#%{__install} -Dp -m0755 %{SOURCE1} %{buildroot}%{_datadir}/gxine/
-#%{__rm} -rf %{buildroot}%{_datadir}/gxine/logo.mpv
 
 # Remove .las
 %{__rm} %{buildroot}%{_libdir}/gxine/*.la
@@ -70,8 +92,8 @@
 mkdir -p %{buildroot}%{_libdir}/mozilla/plugins/
 mv %{buildroot}%{_libdir}/gxine/gxineplugin.so %{buildroot}%{_libdir}/mozilla/plugins/
 # Not supported yet - check bz #213041
-# %find_lang %{name} --all-name
-/usr/lib/rpm/find-lang.sh %{buildroot} %{name} --all-name
+%find_lang %{name} --all-name
+#/usr/lib/rpm/find-lang.sh %{buildroot} %{name} --all-name
 
 desktop-file-install --vendor="fedora" --delete-original \
   --dir %{buildroot}%{_datadir}/applications             \
@@ -112,6 +134,24 @@
 %{_libdir}/mozilla/plugins/gxineplugin.so
 
 %changelog
+* Mon Dec 10 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-13
+- spec cleanup
+- prepare for EPEL
+
+* Wed Nov 21 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-12
+- --rpath hack hopefully no longer needed
+- build against new xulrunner
+
+* Thu Nov 15 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-11
+- add --rpath to xulruner dir, so that libmozjs.so loads correctly
+- enable xulrunner's libmozjs.so
+
+* Wed Nov 14 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.5.11-10
+- Add desktop-file-utils BR
+
+* 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)