From 4848e1e73057e5c931bb482b264aa2789257b978f0c8a2c47a80dfb3d19183e8 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 20 Nov 2010 11:25:23 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/gjs revision 14.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gjs?expand=0&rev=8739c11deb937fcf6a0009e348268cbe --- gjs.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gjs.spec b/gjs.spec index 7e2c993..05e3b03 100644 --- a/gjs.spec +++ b/gjs.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if 0%{suse_version} > 1130 %define xulrunner_ver 20 %else From b1215631ef94b682b9374d3b1f31e117be14295ec68fd798f06a11bd05f7f4f4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 5 Dec 2010 09:06:05 +0000 Subject: [PATCH 2/2] Accepting request 54414 from home:vuntz:branches:GNOME:Factory Thanks.... I think that will also fix my issue of gnome-shell not starting. OBS-URL: https://build.opensuse.org/request/show/54414 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gjs?expand=0&rev=26 --- gjs.changes | 8 ++++++++ gjs.spec | 3 +++ 2 files changed, 11 insertions(+) diff --git a/gjs.changes b/gjs.changes index 6e1da43..ec28724 100644 --- a/gjs.changes +++ b/gjs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Dec 3 14:31:18 CET 2010 - vuntz@opensuse.org + +- Add explicit Requires of mozilla-xulrunner%{xulrunner_ver} to + libgjs0: the Requires on libmozjs.so is not enough, as there + might be more than one provider, and it could be the wrong + version of xulrunner. + ------------------------------------------------------------------- Tue Nov 16 15:51:20 CET 2010 - dimstar@opensuse.org diff --git a/gjs.spec b/gjs.spec index 05e3b03..1372380 100644 --- a/gjs.spec +++ b/gjs.spec @@ -53,6 +53,9 @@ Mozilla SpiderMonkey JavaScript engine. License: MIT License (or similar) Summary: JavaScript bindings based on gobject-introspection and Mozilla Group: Development/Libraries/GNOME +# Explicitly requires the xulrunner version we need, instead of hoping we'll +# get the right one with the libmozjs.so Requires. +Requires: mozilla-xulrunner%{xulrunner_ver} Provides: libgjs-0 = %{version} Obsoletes: libgjs-0 < %{version}