[gjs] build against js, not gecko

Adam Williamson adamwill at fedoraproject.org
Mon Jun 27 18:43:39 UTC 2011


commit cf3354d187f6562d836dbd404c9d7220775ba078
Author: Adam Williamson <awilliam at redhat.com>
Date:   Mon Jun 27 11:43:20 2011 -0700

    build against js, not gecko

 gjs.spec |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/gjs.spec b/gjs.spec
index 9a63079..3e7e264 100644
--- a/gjs.spec
+++ b/gjs.spec
@@ -1,8 +1,6 @@
-%global gecko_version 2.0.1
-
 Name:           gjs
 Version:        1.29.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Javascript Bindings for GNOME
 
 Group:          System Environment/Libraries
@@ -16,7 +14,8 @@ URL:            http://live.gnome.org/Gjs/
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.29/%{name}-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: gecko-devel-unstable = %{gecko_version}
+BuildRequires: js-devel
+BuildRequires: cairo-devel
 BuildRequires: gobject-introspection-devel >= 0.10.1
 BuildRequires: readline-devel
 BuildRequires: dbus-glib-devel
@@ -25,12 +24,6 @@ BuildRequires: pkgconfig
 # Bootstrap requirements
 BuildRequires: gtk-doc gnome-common
 
-# This will have to be updated every time xulrunner changes version.
-# A better fix would be to get all of Fedora's spidermonkey consumers
-# to not depend on xulrunner.  See 
-# https://bugzilla.mozilla.org/show_bug.cgi?id=618381
-Requires: gecko-libs%{?_isa} = %{gecko_version}
-
 %description
 Gjs allows using GNOME libraries from Javascript. It's based on the
 Spidermonkey Javascript engine from Mozilla and the GObject introspection
@@ -91,6 +84,10 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Mon Jun 27 2011 Adam Williamson <awilliam at redhat.com> - 1.29.0-2
+- build against js, not gecko (from f15 branch, but patch not needed)
+- BR cairo-devel (also from f15)
+
 * Fri Jun 17 2011 Tomas Bzatek <tbzatek at redhat.com> - 1.29.0-1
 - Update to 1.29.0
 


More information about the scm-commits mailing list