Accepting request 634813 from GNOME:Next

OBS-URL: https://build.opensuse.org/request/show/634813
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gjs?expand=0&rev=155

gjs.spec

@@ -16,22 +16,19 @@
 #
 
 
+# TODO: systemtap/dtrace is currently (1.53.91) failing, when
+# https://gitlab.gnome.org/GNOME/gjs/issues/196 gets fixed and released,
+# remove all conditional macros and enable systemtap.
+%bcond_with     systemtap
 Name:           gjs
-Version:        1.52.3
+Version:        1.54.0
 Release:        0
 Summary:        JavaScript bindings based on gobject-introspection and Mozilla
-License:        MIT
+License:        MIT AND LGPL-2.0-or-later
 Group:          Development/Libraries/GNOME
 URL:            https://wiki.gnome.org/Projects/Gjs
-Source0:        http://download.gnome.org/sources/gjs/1.52/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM gjs-Add-API-to-force-GC-schedule.patch -- context: Add API to force GC schedule
-Patch0:         gjs-Add-API-to-force-GC-schedule.patch
-# PATCH-FIX-UPSTREAM gjs-Queue-forced-GC.patch -- object: Queue a forced GC when toggling down
-Patch1:         gjs-Queue-forced-GC.patch
-# PATCH-FIX-UPSTREAM gjs-ensure-force_gc-flag-use.patch -- context: Ensure force_gc flag is not lost if the idle is scheduled
-Patch2:         gjs-ensure-force_gc-flag-use.patch
+Source0:        http://download.gnome.org/sources/gjs/1.54/%{name}-%{version}.tar.xz
 BuildRequires:  gcc-c++
-BuildRequires:  mozjs52-devel
 BuildRequires:  pkgconfig
 BuildRequires:  python
 BuildRequires:  readline-devel
@@ -47,7 +44,7 @@ BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 1.53.4
 BuildRequires:  pkgconfig(gthread-2.0) >= 2.50.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.20
 BuildRequires:  pkgconfig(libffi)
-#BuildRequires:  pkgconfig(mozjs-52)
+BuildRequires:  pkgconfig(mozjs-60)
 Requires:       libgjs0 = %{version}
 ExcludeArch:    s390
 
@@ -57,6 +54,7 @@ Mozilla SpiderMonkey JavaScript engine.
 
 %package -n libgjs0
 Summary:        JavaScript bindings based on gobject-introspection and Mozilla
+License:        LGPL-2.0-or-later
 Group:          System/Libraries
 Provides:       libgjs-0 = %{version}
 Obsoletes:      libgjs-0 < %{version}
@@ -68,6 +66,7 @@ Mozilla SpiderMonkey JavaScript engine.
 %package -n typelib-1_0-GjsPrivate-1_0
 Summary:        Introspection bindings for the GJS library
 # The tyeplib was renamed in gnome 3.6, to reflect it is a private lib.
+License:        MIT AND LGPL-2.0-or-later
 Group:          System/Libraries
 Obsoletes:      typelib-1_0-GjsDBus-1_0 < %{version}
 
@@ -77,6 +76,7 @@ Mozilla SpiderMonkey JavaScript engine.
 
 %package -n libgjs-devel
 Summary:        Development files for the GJS library
+License:        MIT AND LGPL-2.0-or-later
 Group:          Development/Libraries/GNOME
 Requires:       %{name} = %{version}
 Requires:       libgjs0 = %{version}
@@ -94,7 +94,7 @@ Mozilla SpiderMonkey JavaScript engine.
 %build
 %configure \
     --disable-static \
-    --enable-systemtap
+    --%{?with_systemtap:enable}%{!?with_systemtap:disable}-systemtap
 make %{?_smp_mflags}
 
 %install
@@ -124,6 +124,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_datadir}/%{name}-1.0/
+%if %{with systemtap}
 %{_datadir}/systemtap/tapset/*.stp
+%endif
 
 %changelog