From: Jakub Bogusz Date: Fri, 20 Dec 2019 18:14:37 +0000 (+0100) Subject: - added python_shebang patch (call python3 directly); release 2 X-Git-Tag: auto/th/glib2-2.62.4-2 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fglib2.git;a=commitdiff_plain;h=01020a748b96cca2f3e3d0ad3f3e885b47ef498b - added python_shebang patch (call python3 directly); release 2 --- diff --git a/glib2-python_shebang.patch b/glib2-python_shebang.patch new file mode 100644 index 0000000..eb48fcf --- /dev/null +++ b/glib2-python_shebang.patch @@ -0,0 +1,43 @@ +--- glib-2.62.4/meson.build.orig 2019-12-19 17:33:15.000000000 +0100 ++++ glib-2.62.4/meson.build 2019-12-20 18:37:03.307665835 +0100 +@@ -1988,7 +1988,7 @@ + + python = import('python').find_installation('python3') + # used for '#!/usr/bin/env ' +-python_name = 'python3' ++python_name = python.path() + + python_version = python.language_version() + python_version_req = '>=3.4' +--- glib-2.62.4/gio/gdbus-2.0/codegen/gdbus-codegen.in.orig 2019-12-19 17:33:15.000000000 +0100 ++++ glib-2.62.4/gio/gdbus-2.0/codegen/gdbus-codegen.in 2019-12-20 18:38:55.327058974 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env @PYTHON@ ++#!@PYTHON@ + + # GDBus - GLib D-Bus Library + # +--- glib-2.62.4/glib/gtester-report.in.orig 2019-12-19 17:33:15.000000000 +0100 ++++ glib-2.62.4/glib/gtester-report.in 2019-12-20 18:38:21.813907197 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env @PYTHON@ ++#!@PYTHON@ + # GLib Testing Framework Utility -*- Mode: python; -*- + # Copyright (C) 2007 Imendio AB + # Authors: Tim Janik +--- glib-2.62.4/gobject/glib-genmarshal.in.orig 2019-12-19 17:33:15.000000000 +0100 ++++ glib-2.62.4/gobject/glib-genmarshal.in 2019-12-20 18:37:54.627387812 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env @PYTHON@ ++#!@PYTHON@ + + # pylint: disable=too-many-lines, missing-docstring, invalid-name + +--- glib-2.62.4/gobject/glib-mkenums.in.orig 2019-12-19 17:33:15.000000000 +0100 ++++ glib-2.62.4/gobject/glib-mkenums.in 2019-12-20 18:38:03.210674646 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env @PYTHON@ ++#!@PYTHON@ + + # If the code below looks horrible and unpythonic, do not panic. + # diff --git a/glib2.spec b/glib2.spec index a34c942..b1a038b 100644 --- a/glib2.spec +++ b/glib2.spec @@ -20,12 +20,13 @@ Summary(tr.UTF-8): Yararlı ufak yordamlar kitaplığı Summary(zh_CN.UTF-8): 实用工具函数库 Name: glib2 Version: 2.62.4 -Release: 1 +Release: 2 Epoch: 1 License: LGPL v2+ Group: Libraries Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.62/glib-%{version}.tar.xz # Source0-md5: d52234ecba128932bed90bbc3553bfe5 +Patch0: %{name}-python_shebang.patch URL: https://www.gtk.org/ BuildRequires: docbook-dtd412-xml BuildRequires: docbook-dtd45-xml @@ -232,6 +233,7 @@ Sondy systemtap/dtrace dla GLib 2. %prep %setup -q -n glib-%{version} +%patch0 -p1 %build %meson build \