From cd06eedfb26bc36bd220d096da933f08be8d8451dff68e011c26a1cd3dfd3cf2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 17 Jan 2018 15:31:00 +0000 Subject: [PATCH] Accepting request 564217 from GNOME:Factory Revert, as this checkout is borked.. - sorry for the breakage OBS-URL: https://build.opensuse.org/request/show/564217 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gjs?expand=0&rev=139 --- _service | 15 --------------- _servicedata | 4 ---- gjs-1.50.2+20180106.b3e0002.tar.xz | 3 --- gjs-1.50.2.tar.xz | 3 +++ gjs.changes | 24 ------------------------ gjs.spec | 28 +++++++++++++--------------- 6 files changed, 16 insertions(+), 61 deletions(-) delete mode 100644 _service delete mode 100644 _servicedata delete mode 100644 gjs-1.50.2+20180106.b3e0002.tar.xz create mode 100644 gjs-1.50.2.tar.xz diff --git a/_service b/_service deleted file mode 100644 index cc7caf5..0000000 --- a/_service +++ /dev/null @@ -1,15 +0,0 @@ - - - https://gitlab.gnome.org/GNOME/gjs.git - git - gnome-3-26 - 1.50.2+%cd.%h - enable - - - *.tar - xz - - - - diff --git a/_servicedata b/_servicedata deleted file mode 100644 index 7d87911..0000000 --- a/_servicedata +++ /dev/null @@ -1,4 +0,0 @@ - - - https://gitlab.gnome.org/GNOME/gjs.git - 0b3d6bb434a13389a5de48a2d849e6a13bdb084f \ No newline at end of file diff --git a/gjs-1.50.2+20180106.b3e0002.tar.xz b/gjs-1.50.2+20180106.b3e0002.tar.xz deleted file mode 100644 index d8e0489..0000000 --- a/gjs-1.50.2+20180106.b3e0002.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:674a2d53e4ece612d6fa8b0bc066314ef3de44366778aa92e202dcabb4625857 -size 323812 diff --git a/gjs-1.50.2.tar.xz b/gjs-1.50.2.tar.xz new file mode 100644 index 0000000..52791c9 --- /dev/null +++ b/gjs-1.50.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fad902cf7a7806454121c03918755c646fcfd6b08b52d488987db4e2d691ff3 +size 611336 diff --git a/gjs.changes b/gjs.changes index aeca0eb..0699e9b 100644 --- a/gjs.changes +++ b/gjs.changes @@ -1,27 +1,3 @@ -------------------------------------------------------------------- -Mon Jan 08 21:22:15 UTC 2018 - zaitor@opensuse.org - -- Update to version 1.50.2+20180106.b3e0002: - + object: - - Only reset keep-alive and disassociate if needed. - - Make clear in toString() proto method when the object is - finalized. - - Show error when using proto functions (connect*, emit) on - destroyed object. - - Only show critical errors on access to finalized objects. - - Remove ObjectInstance from disassociate_list if object is - finalized. - - Leave out param untouched on error. - - Reset the keep alive flag on wrapper when object is disposed. - - Add better logging when invalid access happens. - - Don't resolve or set,get properties on finalized elements. - + installed-tests/js: add testGObjectDestructionAccess to verify - access to destryed objects. -- Switch to git-checkout via source service. Following this, add - autoconf-archive and libtool BuildRequires and pass autogen.sh to - bootstrap the tarball. -- Cleanup spec, use modern macros, autosetup and make_build. - ------------------------------------------------------------------- Tue Oct 31 22:54:17 UTC 2017 - luc14n0@linuxmail.org diff --git a/gjs.spec b/gjs.spec index 9542837..1963e28 100644 --- a/gjs.spec +++ b/gjs.spec @@ -1,7 +1,7 @@ # # spec file for package gjs # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,15 @@ Name: gjs -Version: 1.50.2+20180106.b3e0002 +Version: 1.50.2 Release: 0 # FIXME: find out if tapsets should really be in devel package or in main package Summary: JavaScript bindings based on gobject-introspection and Mozilla License: MIT Group: Development/Libraries/GNOME Url: https://wiki.gnome.org/Projects/Gjs -#Source0: https://download.gnome.org/sources/gjs/1.50/%%{name}-%%{version}.tar.xz -Source: %{name}-%{version}.tar.xz - -BuildRequires: autoconf-archive +Source: https://download.gnome.org/sources/gjs/1.50/%{name}-%{version}.tar.xz BuildRequires: gcc-c++ -BuildRequires: libtool BuildRequires: mozjs52-devel BuildRequires: pkgconfig BuildRequires: python @@ -87,38 +83,40 @@ This module contains JavaScript bindings based on gobject-introspection and the Mozilla SpiderMonkey JavaScript engine. %prep -%autosetup +%setup -q %build -NOCONFIGURE=1 ./autogen.sh %configure \ - --disable-static \ - --enable-systemtap \ - %{nil} -%make_build + --disable-static \ + --enable-systemtap +make %{?_smp_mflags} %install %make_install find %{buildroot} -type f -name "*.la" -delete -print %post -n libgjs0 -p /sbin/ldconfig + %postun -n libgjs0 -p /sbin/ldconfig %files +%defattr(-,root,root) %{_bindir}/gjs %{_bindir}/gjs-console %files -n libgjs0 -%license COPYING +%defattr(-,root,root) +%doc COPYING NEWS README %{_libdir}/*.so.* %files -n typelib-1_0-GjsPrivate-1_0 +%defattr(-,root,root) %dir %{_libdir}/gjs %dir %{_libdir}/gjs/girepository-1.0/ %{_libdir}/gjs/girepository-1.0/GjsPrivate-1.0.typelib %files -n libgjs-devel -%doc NEWS README +%defattr(-,root,root) %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc