From fc65953710f02f839dc59c15db821ca3e4d052af Mon Sep 17 00:00:00 2001 From: caodongxia <315816521@qq.com> Date: Tue, 8 Feb 2022 15:46:15 +0800 Subject: [PATCH] Fix python module pyparsing not found due to pyparsing update (cherry picked from commit 417058f631149e9b61a21d23f816ae7bd383e097) --- fix-finding-pyparsing.patch | 25 +++++++++++++++++++++++++ spice-gtk.spec | 7 +++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 fix-finding-pyparsing.patch diff --git a/fix-finding-pyparsing.patch b/fix-finding-pyparsing.patch new file mode 100644 index 0000000..99dd37f --- /dev/null +++ b/fix-finding-pyparsing.patch @@ -0,0 +1,25 @@ +From 3ff07d859a62e20a0fbbb4b8972bdffec09b7850 Mon Sep 17 00:00:00 2001 +From: caodongxia <315816521@qq.com> +Date: Tue, 8 Feb 2022 15:32:17 +0800 +Subject: [PATCH] fix finding pyparsing + +--- + subprojects/spice-common/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/subprojects/spice-common/meson.build b/subprojects/spice-common/meson.build +index 3123fb1..c8b40dd 100644 +--- a/subprojects/spice-common/meson.build ++++ b/subprojects/spice-common/meson.build +@@ -126,7 +126,7 @@ python = py_module.find_installation() + if get_option('python-checks') + foreach module : ['six', 'pyparsing'] + message('Checking for python module @0@'.format(module)) +- cmd = run_command(python, '-m', module) ++ cmd = run_command(python, '-c', 'import @0@'.format(module)) + if cmd.returncode() != 0 + error('Python module @0@ not found'.format(module)) + endif +-- +2.27.0 + diff --git a/spice-gtk.spec b/spice-gtk.spec index 853b5bc..bc4d3e1 100644 --- a/spice-gtk.spec +++ b/spice-gtk.spec @@ -1,11 +1,11 @@ Name: spice-gtk Version: 0.38 -Release: 2 +Release: 3 Summary: A GIMP Toolkit (GTK+) widget for SPICE clients License: LGPLv2+ URL: https://www.spice-space.org/spice-gtk.html Source0: https://www.spice-space.org/download/gtk/%{name}-%{version}.tar.xz - +Patch0000: fix-finding-pyparsing.patch BuildRequires: git-core meson intltool usbredir-devel >= 0.7.1 libusb1-devel >= 1.0.21 pixman-devel libjpeg-turbo-devel BuildRequires: opus-devel zlib-devel cyrus-sasl-devel libcacard-devel gobject-introspection-devel libacl-devel polkit-devel BuildRequires: gtk-doc vala usbutils libsoup-devel >= 2.49.91 libphodav-devel lz4-devel gtk3-devel json-glib-devel @@ -90,6 +90,9 @@ Files for help with spice-gtk. %{_mandir}/man1/spice-client.1* %changelog +* Tue Feb 08 2022 caodongxia - 0.38-3 +- Fix python module pyparsing not found due to pyparsing update + * Sat Aug 07 2021 caodongxia - 0.38-2 - Fix python module pyparsing not found