rpms/gxine/devel gxine.spec,1.12,1.13
Martin Sourada (mso)
fedora-extras-commits at redhat.com
Thu Nov 15 14:24:04 UTC 2007
- Previous message: rpms/xmlroff/F-7 xmlroff-0.5.2-nolibxslt.patch, NONE, 1.1 xmlroff-0.5.2-rpath.patch, NONE, 1.1 xmlroff.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/thunderbird/devel thunderbird.spec, 1.107, 1.108 firefox-1.0-pango-cairo.patch, 1.2, NONE firefox-1.1-modal-filechooser.patch, 1.1, NONE firefox-1.1-visibility.patch, 1.1, NONE firefox-1.5-dnd-nograb.patch, 1.1, NONE firefox-1.5-gtk-key-theme-crash.patch, 1.1, NONE firefox-1.5.0.10-nss-system-nspr.patch, 1.1, NONE firefox-1.5.0.10-with-system-nss.patch, 1.1, NONE firefox-PR1-gnome-vfs-default-app.patch, 1.1, NONE mozilla-1.7.3-pango-render.patch, 1.4, NONE thunderbird-1.5-visibility.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mso
Update of /cvs/extras/rpms/gxine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26388
Modified Files:
gxine.spec
Log Message:
Use xulrunner's libmozjs.so instead of libjs, add --rpath to LDFLAGS, so that it finds libmozjs.so corretly.
Index: gxine.spec
===================================================================
RCS file: /cvs/extras/rpms/gxine/devel/gxine.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gxine.spec 14 Nov 2007 17:10:35 -0000 1.12
+++ gxine.spec 15 Nov 2007 14:23:31 -0000 1.13
@@ -1,8 +1,11 @@
-%define use_xulrunner_js 0
+%define use_xulrunner_js 1
+%define gecko_dev_ver 1.9
+%define gecko_libs_ver %{gecko_dev_ver}a9pre
+%define xul_mozjs_path /usr/lib/xulrunner-%{gecko_libs_ver}
Name: gxine
Version: 0.5.11
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: GTK frontend for the xine multimedia library
Group: Applications/Multimedia
@@ -16,7 +19,7 @@
%if 0%{?use_xulrunner_js}
-BuildRequires: gecko-devel = 1.9
+BuildRequires: gecko-devel = %{gecko_dev_ver}
%else
BuildRequires: js-devel
%endif
@@ -35,6 +38,10 @@
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
@@ -67,6 +74,11 @@
%build
%configure --with-dbus --with-logo-format=image --with-browser-plugin --disable-integration-wizard
+
+%if 0%{?use_xulrunner_js}
+%{__sed} -i 's at LDFLAGS = -Wl,--as-needed at LDFLAGS = -Wl,--as-needed,--rpath=%{xul_mozjs_path}@' src/Makefile
+%endif
+
make %{?_smp_mflags}
@@ -125,6 +137,10 @@
%{_libdir}/mozilla/plugins/gxineplugin.so
%changelog
+* 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
- Previous message: rpms/xmlroff/F-7 xmlroff-0.5.2-nolibxslt.patch, NONE, 1.1 xmlroff-0.5.2-rpath.patch, NONE, 1.1 xmlroff.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/thunderbird/devel thunderbird.spec, 1.107, 1.108 firefox-1.0-pango-cairo.patch, 1.2, NONE firefox-1.1-modal-filechooser.patch, 1.1, NONE firefox-1.1-visibility.patch, 1.1, NONE firefox-1.5-dnd-nograb.patch, 1.1, NONE firefox-1.5-gtk-key-theme-crash.patch, 1.1, NONE firefox-1.5.0.10-nss-system-nspr.patch, 1.1, NONE firefox-1.5.0.10-with-system-nss.patch, 1.1, NONE firefox-PR1-gnome-vfs-default-app.patch, 1.1, NONE mozilla-1.7.3-pango-render.patch, 1.4, NONE thunderbird-1.5-visibility.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list