diff --git a/.gitignore b/.gitignore index 8df4f02..e7b9692 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ gjs-0.7.1.tar.gz /gjs-1.58.1.tar.xz /gjs-1.58.3.tar.xz /gjs-1.63.2.tar.xz +/gjs-1.63.3.tar.xz diff --git a/0001-build-Fix-installation-with-DESTDIR-set.patch b/0001-build-Fix-installation-with-DESTDIR-set.patch deleted file mode 100644 index a7d7722..0000000 --- a/0001-build-Fix-installation-with-DESTDIR-set.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 4a7c705a8c181eda6bb4e03a5674aab393331a04 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 29 Nov 2019 17:50:48 +0100 -Subject: [PATCH] build: Fix installation with DESTDIR set - -os.path.join() doesn't simply concatenate paths as: -If a component is an absolute path, all previous components are -thrown away and joining continues from the absolute path component. - -Strip the leading '/' from the configured prefix if needed to prevent -that. - -Closes: https://gitlab.gnome.org/GNOME/gjs/issues/291 ---- - build/symlink-gjs.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/build/symlink-gjs.py b/build/symlink-gjs.py -index 365a3211..2c6f0a57 100644 ---- a/build/symlink-gjs.py -+++ b/build/symlink-gjs.py -@@ -12,7 +12,11 @@ destdir = os.environ.get('DESTDIR') - install_prefix = os.environ.get('MESON_INSTALL_PREFIX') - bindir = sys.argv[1] - if destdir is not None: -- installed_bin_dir = os.path.join(destdir, install_prefix, bindir) -+ # os.path.join() doesn't concat paths if one of them is absolute -+ if install_prefix[0] == '/' and os.name is not 'nt': -+ installed_bin_dir = os.path.join(destdir, install_prefix[1:], bindir) -+ else: -+ installed_bin_dir = os.path.join(destdir, install_prefix, bindir) - else: - installed_bin_dir = os.path.join(install_prefix, bindir) - --- -2.23.0 - diff --git a/gjs.spec b/gjs.spec index 9634966..b3312d2 100644 --- a/gjs.spec +++ b/gjs.spec @@ -1,10 +1,10 @@ %global glib2_version 2.58.0 -%global gobject_introspection_version 1.41.4 +%global gobject_introspection_version 1.61.2 %global gtk3_version 3.20 %global mozjs60_version 60.9.0 Name: gjs -Version: 1.63.2 +Version: 1.63.3 Release: 1%{?dist} Summary: Javascript Bindings for GNOME @@ -14,9 +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.58/%{name}-%{version}.tar.xz - -Patch0: 0001-build-Fix-installation-with-DESTDIR-set.patch +Source0: https://download.gnome.org/sources/%{name}/1.63/%{name}-%{version}.tar.xz BuildRequires: cairo-gobject-devel BuildRequires: chrpath @@ -82,7 +80,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %files %license COPYING -%doc NEWS README +%doc NEWS README.md %{_bindir}/gjs %{_bindir}/gjs-console %{_libdir}/*.so.* @@ -103,6 +101,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{_datadir}/installed-tests %changelog +* Wed Jan 08 2020 Kalev Lember - 1.63.3-1 +- Update to 1.63.3 + * Wed Dec 11 2019 Florian Müllner - 1.63.2-1 - Update to 1.63.2 diff --git a/sources b/sources index 6d33f5c..a47faec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gjs-1.63.2.tar.xz) = d10016d7ce9a2adff1d4e69c50e8ea1a556924358a9a281c1c8fb68e8c445d274afa33b8b43b3d4f6cb0b0d600cfcbdf4fc942639fa4cca98a3cfca146771f1c +SHA512 (gjs-1.63.3.tar.xz) = a2ba8633a656e980deaf8bf740e8c88fbab7b59e867237ee6f7697f262f7d363c4e5fbd52277d20bd86b4a6c6fa2452b86cb0d9beef2e7c586f6397ae7d62924