diff --git a/.cvsignore b/.cvsignore index a3bc436..ad22e77 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gjs-0.4.tar.bz2 +gjs-0.5-20100114.tar.bz2 diff --git a/gjs.spec b/gjs.spec index 401c9b5..65b2e93 100644 --- a/gjs.spec +++ b/gjs.spec @@ -1,6 +1,13 @@ +# Tarfile created using git +# git clone git://git.gnome.org/gjs +# git archive --format=tar --prefix=%{name}-%{version}/ %{git_version} | bzip2 > ~/%{name}-%{version}-%{gitdate}.tar.bz2 +%define gitdate 20100114 +%define git_version b3b2053 +%define tarfile %{name}-%{version}-%{gitdate}.tar.bz2 + Name: gjs -Version: 0.4 -Release: 1%{?dist} +Version: 0.5 +Release: 0.1%{?dist} Summary: Javascript Bindings for GNOME Group: System Environment/Libraries @@ -10,7 +17,8 @@ Group: System Environment/Libraries # Stack printer (gjs/stack.c) License: MIT and (MPLv1.1 or GPLv2+ or LGPLv2+) URL: http://live.gnome.org/Gjs/ -Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.bz2 +# Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/0.4/%{name}-%{version}.tar.bz2 +Source0: %{tarfile} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xulrunner-devel @@ -18,6 +26,10 @@ BuildRequires: gobject-introspection-devel BuildRequires: dbus-glib-devel BuildRequires: pkgconfig +# For the git snaphot +BuildRequires: libtool +BuildRequires: gnome-common + %description Gjs allows using GNOME libraries from Javascript. It's based on the Spidermonkey Javascript engine from Mozilla and the GObject introspection @@ -35,6 +47,11 @@ Files for development with %{name}. %prep %setup -q +# Don't run configure from autogen.sh +NOCONFIGURE=yes ./autogen.sh + +./autogen.sh + %build %configure --disable-static # Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath @@ -79,6 +96,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Thu Jan 14 2010 Peter Robinson 0.5-0.1 +- Move to git snapshot to fix compile against xulrunner 1.9.2.1 + * Thu Aug 27 2009 Peter Robinson 0.4-1 - New upstream 0.4 release diff --git a/sources b/sources index d3ccdb7..d6299d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -584594b22e433d56d660a7dda650809d gjs-0.4.tar.bz2 +60edb1bca46d04a10de21381b7ebf0aa gjs-0.5-20100114.tar.bz2