From 3ffb1b977f29fcc22240fecd698a832d2c44b02d Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@redhat.com>
Date: Tue, 25 Jan 2011 14:52:20 -0800
Subject: [PATCH] Rebuild

JS API changed slightly once more.  Just making the change directly
instead of the patch to configure that's upstream in order to avoid
adding a BuildRequire and call to autoconf.
---
 gjs-0.7.9-ffb10.patch | 14 ++++++++++++++
 gjs.spec              |  7 ++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 gjs-0.7.9-ffb10.patch

diff --git a/gjs-0.7.9-ffb10.patch b/gjs-0.7.9-ffb10.patch
new file mode 100644
index 0000000..3fd76fe
--- /dev/null
+++ b/gjs-0.7.9-ffb10.patch
@@ -0,0 +1,14 @@
+Based on http://git.gnome.org/browse/gjs/commit/?id=950d000d94cef63496747119e7822f9978088864
+
+diff -up gjs-0.7.9/gjs/jsapi-util.c.ffb10 gjs-0.7.9/gjs/jsapi-util.c
+--- gjs-0.7.9/gjs/jsapi-util.c.ffb10	2011-01-25 01:05:34.013344556 -0800
++++ gjs-0.7.9/gjs/jsapi-util.c	2011-01-25 01:06:20.121768121 -0800
+@@ -255,7 +255,7 @@ gjs_init_context_standard (JSContext    
+ {
+     JSObject *global;
+ #ifdef HAVE_MOZJS_2
+-    global = JS_NewGlobalObject(context, &global_class);
++    global = JS_NewCompartmentAndGlobalObject(context, &global_class, NULL);
+     if (global == NULL)
+         return FALSE;
+ #else
diff --git a/gjs.spec b/gjs.spec
index 6337010..27a0d30 100644
--- a/gjs.spec
+++ b/gjs.spec
@@ -1,6 +1,6 @@
 Name:           gjs
 Version:        0.7.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Javascript Bindings for GNOME
 
 Group:          System Environment/Libraries
@@ -12,6 +12,7 @@ License:        MIT and (MPLv1.1 or GPLv2+ or LGPLv2+)
 URL:            http://live.gnome.org/Gjs/
 #VCS:           git://git.gnome.org/gjs
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Patch0:         gjs-0.7.9-ffb10.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: xulrunner-devel
@@ -38,6 +39,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .ffb10
 
 %build
 (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -82,6 +84,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Tue Jan 25 2011 Christopher Aillon <caillon@redhat.com> - 0.7.9-3
+- Rebuild for new xulrunner
+
 * Fri Jan 14 2011 Christopher Aillon <caillon@redhat.com> - 0.7.9-2
 - Rebuild for new xulrunner