From b37fd1c45db8a9876bdfa886ee19d5496d83e2d3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 27 Jul 2011 17:48:52 -0400 Subject: [PATCH 1/8] 1.29.15 --- .gitignore | 1 + gjs.spec | 13 ++++++------- sources | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 1d74f0e..51c4e92 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ gjs-0.7.1.tar.gz /gjs-0.7.13.tar.bz2 /gjs-0.7.14.tar.bz2 /gjs-1.29.0.tar.xz +/gjs-1.29.15.tar.xz diff --git a/gjs.spec b/gjs.spec index 3e7e264..864c2f0 100644 --- a/gjs.spec +++ b/gjs.spec @@ -1,6 +1,6 @@ Name: gjs -Version: 1.29.0 -Release: 2%{?dist} +Version: 1.29.15 +Release: 1%{?dist} Summary: Javascript Bindings for GNOME Group: System Environment/Libraries @@ -11,8 +11,7 @@ Group: System Environment/Libraries 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}/1.29/%{name}-%{version}.tar.xz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: http://download.gnome.org/sources/%{name}/1.29/%{name}-%{version}.tar.xz BuildRequires: js-devel BuildRequires: cairo-devel @@ -48,7 +47,6 @@ Files for development with %{name}. make %{?_smp_mflags} %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} #Remove libtool archives. @@ -65,7 +63,6 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc COPYING NEWS README %{_bindir}/gjs %{_bindir}/gjs-console @@ -74,7 +71,6 @@ rm -rf %{buildroot} %{_datadir}/gjs-1.0 %files devel -%defattr(-,root,root,-) %doc examples/* %{_includedir}/gjs-1.0 %{_libdir}/pkgconfig/gjs-1.0.pc @@ -84,6 +80,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Wed Jul 27 2011 Matthias Clasen - 1.29.15-1 +- Update to 1.29.15 + * Mon Jun 27 2011 Adam Williamson - 1.29.0-2 - build against js, not gecko (from f15 branch, but patch not needed) - BR cairo-devel (also from f15) diff --git a/sources b/sources index d482a47..b3e68a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3f98ecd523e4f5afdf99cabf550dffc0 gjs-1.29.0.tar.xz +0b83edf71a2c5dc990a680dda3bf55c8 gjs-1.29.15.tar.xz From 2b54db14bf7de472823fdc059281d44172322e3a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 28 Jul 2011 16:02:49 -0400 Subject: [PATCH 2/8] BR latest g-i to fix build issue Conflicts: gjs.spec --- gjs.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gjs.spec b/gjs.spec index 864c2f0..13fee2b 100644 --- a/gjs.spec +++ b/gjs.spec @@ -1,6 +1,6 @@ Name: gjs Version: 1.29.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Javascript Bindings for GNOME Group: System Environment/Libraries @@ -15,7 +15,7 @@ Source0: http://download.gnome.org/sources/%{name}/1.29/%{name}-%{version BuildRequires: js-devel BuildRequires: cairo-devel -BuildRequires: gobject-introspection-devel >= 0.10.1 +BuildRequires: gobject-introspection-devel >= 1.29.16 BuildRequires: readline-devel BuildRequires: dbus-glib-devel BuildRequires: intltool @@ -80,6 +80,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Thu Jul 28 2011 Colin Walters - 1.29.15-2 +- BR latest g-i to fix build issue + * Wed Jul 27 2011 Matthias Clasen - 1.29.15-1 - Update to 1.29.15 From de8afcb100e723f623eaf80729b24664e44cc06d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 29 Jul 2011 12:38:49 -0400 Subject: [PATCH 3/8] gjs.spec: Remove no longer shipped file --- gjs.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/gjs.spec b/gjs.spec index 13fee2b..e30bdc9 100644 --- a/gjs.spec +++ b/gjs.spec @@ -74,7 +74,6 @@ rm -rf %{buildroot} %doc examples/* %{_includedir}/gjs-1.0 %{_libdir}/pkgconfig/gjs-1.0.pc -%{_libdir}/pkgconfig/gjs-gi-1.0.pc %{_libdir}/pkgconfig/gjs-dbus-1.0.pc %{_libdir}/pkgconfig/gjs-internals-1.0.pc %{_libdir}/*.so From afe6c5d659f63494ee3a2cf891fc9dec63a407a2 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 29 Jul 2011 14:19:47 -0400 Subject: [PATCH 4/8] Also add expected files --- gjs.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gjs.spec b/gjs.spec index e30bdc9..873e47e 100644 --- a/gjs.spec +++ b/gjs.spec @@ -68,11 +68,13 @@ rm -rf %{buildroot} %{_bindir}/gjs-console %{_libdir}/*.so.* %{_libdir}/gjs-1.0 +%{_libdir}/gjs/*.typelib %{_datadir}/gjs-1.0 %files devel %doc examples/* %{_includedir}/gjs-1.0 +%{_libdir}/gjs/*.gir %{_libdir}/pkgconfig/gjs-1.0.pc %{_libdir}/pkgconfig/gjs-dbus-1.0.pc %{_libdir}/pkgconfig/gjs-internals-1.0.pc From f2fe80fc78c0ccdf64158e728ed34ae06f5660ec Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 4 Aug 2011 12:06:23 +0100 Subject: [PATCH 5/8] Install missing headers --- gjs.spec | 11 ++++++- install-gi-headers.patch | 63 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 install-gi-headers.patch diff --git a/gjs.spec b/gjs.spec index 873e47e..f5815b9 100644 --- a/gjs.spec +++ b/gjs.spec @@ -1,6 +1,6 @@ Name: gjs Version: 1.29.15 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Javascript Bindings for GNOME Group: System Environment/Libraries @@ -23,6 +23,9 @@ BuildRequires: pkgconfig # Bootstrap requirements BuildRequires: gtk-doc gnome-common +# https://bugzilla.gnome.org/show_bug.cgi?id=655482 +Patch0: install-gi-headers.patch + %description Gjs allows using GNOME libraries from Javascript. It's based on the Spidermonkey Javascript engine from Mozilla and the GObject introspection @@ -40,6 +43,9 @@ Files for development with %{name}. %prep %setup -q +%patch0 -p1 -b .headers +rm -f configure + %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi; %configure --disable-static) @@ -81,6 +87,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Thu Aug 04 2011 Bastien Nocera 1.29.15-3 +- Install missing headers + * Thu Jul 28 2011 Colin Walters - 1.29.15-2 - BR latest g-i to fix build issue diff --git a/install-gi-headers.patch b/install-gi-headers.patch new file mode 100644 index 0000000..0004a34 --- /dev/null +++ b/install-gi-headers.patch @@ -0,0 +1,63 @@ +From 4217cb5e07519ea41fdff9b906b93ce6946c109e Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Sat, 30 Jul 2011 11:40:25 -0400 +Subject: [PATCH] Install gi/ headers again + +libpeas currently requires these; we were installing them before, and +since we export almost all of our internals in for gjs-module.pc, might +as well keep doing these for now. + +https://bugzilla.gnome.org/show_bug.cgi?id=655482 +--- + Makefile.am | 28 ++++++++++++++-------------- + 1 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index edf0c25..b088289 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -36,7 +36,20 @@ nobase_gjs_module_include_HEADERS = \ + gjs/importer.h \ + gjs/jsapi-util.h \ + gjs/mem.h \ +- gjs/native.h ++ gjs/native.h \ ++ gi/ns.h \ ++ gi/object.h \ ++ gi/foreign.h \ ++ gi/param.h \ ++ gi/repo.h \ ++ gi/union.h \ ++ gi/value.h \ ++ gi/arg.h \ ++ gi/boxed.h \ ++ gi/closure.h \ ++ gi/enumeration.h \ ++ gi/function.h \ ++ gi/keep-alive.h + + noinst_HEADERS += \ + gjs/jsapi-private.h \ +@@ -108,20 +121,7 @@ libgjs_la_SOURCES = \ + + # For historical reasons, some files live in gi/ + libgjs_la_SOURCES += \ +- gi/arg.h \ +- gi/boxed.h \ +- gi/closure.h \ +- gi/enumeration.h \ +- gi/function.h \ +- gi/keep-alive.h \ + gi/gjs_gi_trace.h \ +- gi/ns.h \ +- gi/object.h \ +- gi/foreign.h \ +- gi/param.h \ +- gi/repo.h \ +- gi/union.h \ +- gi/value.h \ + gi/arg.c \ + gi/boxed.c \ + gi/closure.c \ +-- +1.7.6 \ No newline at end of file From 484228a0f1ce331dab4ad1243eaf77c24700290e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 18 Aug 2011 00:03:04 -0400 Subject: [PATCH 6/8] 1.29.16 --- .gitignore | 1 + gjs.spec | 10 +++++----- sources | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 51c4e92..96ef354 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ gjs-0.7.1.tar.gz /gjs-0.7.14.tar.bz2 /gjs-1.29.0.tar.xz /gjs-1.29.15.tar.xz +/gjs-1.29.16.tar.xz diff --git a/gjs.spec b/gjs.spec index f5815b9..e53542a 100644 --- a/gjs.spec +++ b/gjs.spec @@ -1,6 +1,6 @@ Name: gjs -Version: 1.29.15 -Release: 3%{?dist} +Version: 1.29.16 +Release: 1%{?dist} Summary: Javascript Bindings for GNOME Group: System Environment/Libraries @@ -61,9 +61,6 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %check #make check -%clean -rm -rf %{buildroot} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -87,6 +84,9 @@ rm -rf %{buildroot} %{_libdir}/*.so %changelog +* Thus Aug 18 2011 Matthias Clasen 1.29.16-1 +- Update to 1.29.16 + * Thu Aug 04 2011 Bastien Nocera 1.29.15-3 - Install missing headers diff --git a/sources b/sources index b3e68a4..95742cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0b83edf71a2c5dc990a680dda3bf55c8 gjs-1.29.15.tar.xz +b9469283ad387bb769936e564e947b0f gjs-1.29.16.tar.xz From 0db9eafa678817e248a9d61a3963350042e12aa7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 18 Aug 2011 00:04:17 -0400 Subject: [PATCH 7/8] fix spec --- gjs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gjs.spec b/gjs.spec index e53542a..0a4054b 100644 --- a/gjs.spec +++ b/gjs.spec @@ -84,7 +84,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_libdir}/*.so %changelog -* Thus Aug 18 2011 Matthias Clasen 1.29.16-1 +* Thu Aug 18 2011 Matthias Clasen 1.29.16-1 - Update to 1.29.16 * Thu Aug 04 2011 Bastien Nocera 1.29.15-3 From 91a1ee156251133fb2d628f611cb40c26cee046b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 18 Aug 2011 00:15:26 -0400 Subject: [PATCH 8/8] drop obsolete patch --- gjs.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/gjs.spec b/gjs.spec index 0a4054b..621399e 100644 --- a/gjs.spec +++ b/gjs.spec @@ -23,9 +23,6 @@ BuildRequires: pkgconfig # Bootstrap requirements BuildRequires: gtk-doc gnome-common -# https://bugzilla.gnome.org/show_bug.cgi?id=655482 -Patch0: install-gi-headers.patch - %description Gjs allows using GNOME libraries from Javascript. It's based on the Spidermonkey Javascript engine from Mozilla and the GObject introspection @@ -43,7 +40,6 @@ Files for development with %{name}. %prep %setup -q -%patch0 -p1 -b .headers rm -f configure %build