diff --git a/gjs-1.54.1.tar.xz b/gjs-1.54.1.tar.xz deleted file mode 100644 index ff8e890..0000000 Binary files a/gjs-1.54.1.tar.xz and /dev/null differ diff --git a/gjs-1.66.2.tar.xz b/gjs-1.66.2.tar.xz new file mode 100644 index 0000000..71a2cc1 Binary files /dev/null and b/gjs-1.66.2.tar.xz differ diff --git a/gjs.spec b/gjs.spec index afc8742..9de13a7 100644 --- a/gjs.spec +++ b/gjs.spec @@ -1,50 +1,57 @@ +%global glib2_version 2.58.0 +%global gobject_introspection_version 1.61.2 +%global gtk3_version 3.20 +%global mozjs78_version 78.4.0-1 + Name: gjs -Version: 1.54.1 -Release: 5 +Version: 1.66.2 +Release: 1 Summary: using GNOME libraries from Javascript License: MIT and (MPLv1.1 or GPLv2+ or LGPLv2+) -URL: https://wiki.gnome.org/Attic/Gjs -Source0: https://download.gnome.org/sources/gjs/1.54/gjs-%{version}.tar.xz +URL: https://wiki.gnome.org/Projects/Gjs +Source0: https://download.gnome.org/sources/%{name}/1.66/%{name}-%{version}.tar.xz -BuildRequires: cairo-gobject-devel chrpath gobject-introspection-devel >= 1.41.4 -BuildRequires: glib2-devel >= 2.54.0 gtk3-devel >= 3.20 mozjs60-devel >= 60.2.2 -BuildRequires: readline-devel dbus-glib-devel gcc-c++ gettext pkgconfig dbus-daemon +BuildRequires: cairo-gobject-devel dbus-daemon dbus-glib-devel gcc-c++ +BuildRequires: meson cmake gettext pkgconfig readline-devel sysprof-devel +BuildRequires: gtk3-devel >= %{gtk3_version} +BuildRequires: glib2-devel >= %{glib2_version} +BuildRequires: mozjs78-devel >= %{mozjs78_version} +BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version} -Requires: glib2 >= 2.54.0 gobject-introspection >= 1.41.4 gtk3 >= 3.20 mozjs60 >= 60.2.2 +Requires: gtk3%{?_isa} >= %{gtk3_version} +Requires: glib2%{?_isa} >= %{glib2_version} +Requires: mozjs78%{?_isa} >= %{mozjs78_version} +Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version} + +# Filter provides for private libraries +%global __provides_exclude_from ^%{_libdir}/gjs/ %description Gjs is a Javascript binding for GNOME. It's mainly based on Spidermonkey javascript engine and the GObject introspection framework. %package devel -Summary: Development files for gjs -Requires: %{name} = %{version}-%{release} - -Provides: %{name}-tests = %{version}-%{release} -Obsoletes: %{name}-tests < %{version}-%{release} +Summary: Development files for gjs +Requires: %{name}%{?_isa} = %{version}-%{release} +Provides: %{name}-tests = %{version}-%{release} +Obsoletes: %{name}-tests < %{version}-%{release} %description devel Development files for gjs. %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -p1 %build -%configure --enable-installed-tests - -%make_build V=1 +%meson +%meson_build %install -%make_install - -chrpath --delete %{buildroot}%{_bindir}/gjs-console -chrpath --delete %{buildroot}%{_libexecdir}/gjs/installed-tests/minijasmine - -%delete_la +%meson_install %files %defattr(-,root,root) -%doc NEWS README +%doc NEWS README.md %license COPYING %{_bindir}/gjs* %{_libdir}/*.so.* @@ -56,12 +63,16 @@ chrpath --delete %{buildroot}%{_libexecdir}/gjs/installed-tests/minijasmine %{_includedir}/gjs-1.0 %{_libdir}/pkgconfig/gjs-1.0.pc %{_libdir}/*.so -%{_libexecdir}/gjs/installed-tests +%{_libexecdir}/installed-tests %{_datadir}/gjs-1.0/lsan/ %{_datadir}/gjs-1.0/valgrind/ %{_datadir}/installed-tests +%{_datadir}/glib-2.0/schemas/org.gnome.GjsTest.gschema.xml %changelog +* Fri Jul 23 2021 hanhui - 1.66.2-1 +- Upgrade to 1.66.2 + * Mon Jan 20 2020 openEuler Buildteam - 1.54.1-5 - Type:bugfix - Id:NA