Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gjs.git#47d2f8285fce93f972973f4c641adc40f61a70a3
This commit is contained in:
DistroBaker 2021-01-26 12:50:31 +00:00
parent 81226dd08d
commit 17abeef1bb
3 changed files with 22 additions and 6 deletions

1
.gitignore vendored
View File

@ -114,3 +114,4 @@ gjs-0.7.1.tar.gz
/gjs-1.66.0.tar.xz
/gjs-1.66.1.tar.xz
/gjs-1.66.2.tar.xz
/gjs-1.67.1.tar.xz

View File

@ -1,11 +1,11 @@
%global glib2_version 2.58.0
%global gobject_introspection_version 1.61.2
%global gtk3_version 3.20
%global mozjs78_version 78.6.0-1
%global mozjs78_version 78.7.0-1
Name: gjs
Version: 1.66.2
Release: 1%{?dist}
Version: 1.67.1
Release: 2%{?dist}
Summary: Javascript Bindings for GNOME
# The following files contain code from Mozilla which
@ -14,7 +14,7 @@ Summary: Javascript Bindings for GNOME
# Stack printer (gjs/stack.c)
License: MIT and (MPLv1.1 or GPLv2+ or LGPLv2+)
URL: https://wiki.gnome.org/Projects/Gjs
Source0: https://download.gnome.org/sources/%{name}/1.66/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/%{name}/1.67/%{name}-%{version}.tar.xz
Patch0: %{name}-gcc11.patch
BuildRequires: cairo-gobject-devel
@ -31,6 +31,9 @@ BuildRequires: pkgconfig
BuildRequires: readline-devel
BuildRequires: sysprof-devel
# xvfb for test suite
BuildRequires: xorg-x11-server-Xvfb
Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version}
Requires: gtk3%{?_isa} >= %{gtk3_version}
@ -70,7 +73,9 @@ the functionality of the installed gjs package.
%meson_install
%check
#meson_test
# we need to do this as meson_test macro begins with newline character
TEST_CMD="%meson_test"
xvfb-run -s "-screen 0 1600x1200x24" `echo $TEST_CMD | grep -v -e "^$"`
%files
%license COPYING
@ -95,6 +100,16 @@ the functionality of the installed gjs package.
%{_datadir}/installed-tests/
%changelog
* Tue Jan 26 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.67.1-2
- Enable tests during rpmbuild
* Tue Jan 26 2021 Frantisek Zatloukal <fzatlouk@redhat.com> - 1.67.1-1
- Update to 1.67.1
- Rebuild against mozjs78-78.7.0-1
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.66.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Jan 16 2021 Kalev Lember <klember@redhat.com> - 1.66.2-1
- Update to 1.66.2

View File

@ -1 +1 @@
SHA512 (gjs-1.66.2.tar.xz) = 2e0ca24532b3203a55089eb25de19b4b4f33166f40d1231198947057e45f364d3c7f794ff2079c1d9aee3fde9f99cd844944229d89d5e344a97254aaa42bad40
SHA512 (gjs-1.67.1.tar.xz) = b4e570855e256fa4de20399be5869031c422992e104c6741610ca48dd638ef779a5432f648515f2260ac2a63b318354c6c33452657934e97c090f55b1685a7d4