diff --git a/fix-test-failure-of-test_atoms-and-test_overrides_gtk.patch b/fix-test-failure-of-test_atoms-and-test_overrides_gtk.patch new file mode 100644 index 0000000000000000000000000000000000000000..ed3ca39e161c6859771b109b9956ae3123097762 --- /dev/null +++ b/fix-test-failure-of-test_atoms-and-test_overrides_gtk.patch @@ -0,0 +1,39 @@ +From 925182370146907c51712d77bc026177f0644425 Mon Sep 17 00:00:00 2001 +From: panxiaohe +Date: Sat, 22 May 2021 15:21:50 +0800 +Subject: [PATCH] fix test failure of test_atoms and test_overrides_gtk + +--- + tests/test_atoms.py | 2 +- + tests/test_overrides_gtk.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test_atoms.py b/tests/test_atoms.py +index 26d5c43..c2d41cb 100644 +--- a/tests/test_atoms.py ++++ b/tests/test_atoms.py +@@ -24,7 +24,7 @@ def is_X11(): + + + @unittest.skipUnless(Gdk, 'Gdk not available') +-@unittest.skipIf(Gdk._version == "4.0", 'Gdk4 doesn\'t have GdkAtom') ++#@unittest.skipIf(Gdk._version == "4.0", 'Gdk4 doesn\'t have GdkAtom') + class TestGdkAtom(unittest.TestCase): + def test_create(self): + atom = Gdk.Atom.intern('my_string', False) +diff --git a/tests/test_overrides_gtk.py b/tests/test_overrides_gtk.py +index 88b3f88..9bbf35b 100644 +--- a/tests/test_overrides_gtk.py ++++ b/tests/test_overrides_gtk.py +@@ -40,7 +40,7 @@ def gtkver(): + Gtk.get_micro_version()) + + +-GTK4 = (Gtk._version == "4.0") ++GTK4 = (Gtk_version == "4.0") + + + @contextlib.contextmanager +-- +1.8.3.1 + diff --git a/pygobject-3.30.1.tar.xz b/pygobject-3.30.1.tar.xz deleted file mode 100644 index 60f5d9ebc7e8623cb9bab89ff67772281b12973a..0000000000000000000000000000000000000000 Binary files a/pygobject-3.30.1.tar.xz and /dev/null differ diff --git a/pygobject-3.36.1.tar.xz b/pygobject-3.36.1.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..ab2724b95a3ac34b5610b25fe1c045c7561bb43f Binary files /dev/null and b/pygobject-3.36.1.tar.xz differ diff --git a/pygobject3.spec b/pygobject3.spec index 52b3a214157900108ddad81a2e7374885aad1772..41fee1f5493e1d824005a95d9572188c3ae79bc6 100644 --- a/pygobject3.spec +++ b/pygobject3.spec @@ -1,18 +1,22 @@ %global with_python3 1 Name: pygobject3 -Version: 3.30.1 -Release: 2 +Version: 3.36.1 +Release: 3 Summary: Provides bindings for GObject based libraries License: LGPLv2+ and MIT URL: https://wiki.gnome.org/Projects/PyGObject -Source0: https://download.gnome.org/sources/pygobject/3.30/pygobject-%{version}.tar.xz +Source0: https://download.gnome.org/sources/pygobject/3.36/pygobject-%{version}.tar.xz -BuildRequires: glib2-devel >= 2.38.0 gobject-introspection-devel >= 1.46.0 +Patch9000: fix-test-failure-of-test_atoms-and-test_overrides_gtk.patch + +BuildRequires: glib2-devel >= 2.48.0 gobject-introspection-devel >= 1.46.0 BuildRequires: meson cairo-gobject-devel python2-devel >= 2.7 python2-cairo-devel >= 1.11.1 +BuildRequires: python2-pytest python3-pytest %if 0%{?with_python3} BuildRequires: python3-devel >= 3.4 python3-cairo-devel >= 1.11.1 %endif +BuildRequires: gtk3 dbus-x11 dejavu-fonts xorg-x11-server-Xvfb %description PyGObject is a Python package which provides bindings for GObject based libraries such as @@ -27,7 +31,6 @@ Summary: GObject library wrapper for python 2 Requires: python2-gobject-base%{?_isa} = %{version}-%{release} Requires: python2-cairo%{?_isa} >= 1.11.1 -Obsoletes: %{name} Provides: %{name} = %{version}-%{release} Provides: %{name}%{?_isa} = %{version}-%{release} @@ -41,7 +44,6 @@ for use in Python 2 programs. Summary: base package for python2-gobject package Requires: gobject-introspection%{?_isa} -Obsoletes: %{name}-base Provides: %{name}-base = %{version}-%{release} Provides: %{name}-base%{?_isa} = %{version}-%{release} @@ -79,7 +81,7 @@ Requires: gobject-introspection-devel%{?_isa} This package contains files required to embed PyGObject %prep -%autosetup -n pygobject-%{version} +%autosetup -n pygobject-%{version} -p1 rm -rf %{py3dir} cp -a . %{py3dir} @@ -101,6 +103,10 @@ pushd %{py3dir} %meson_install popd +%check +xvfb-run %{__python2} setup.py test +xvfb-run %{__python3} setup.py test + %pre %preun @@ -118,7 +124,7 @@ popd %dir %{python2_sitearch}/gi %{python2_sitearch}/gi/* %{python2_sitearch}/pygtkcompat/ -%{python2_sitelib}/PyGObject-*.egg-info +%{python2_sitearch}/PyGObject-*.egg-info %exclude %{python2_sitearch}/gi/_gi_cairo.so %files -n python3-gobject @@ -131,7 +137,7 @@ popd %{python3_sitearch}/gi/* %exclude %{python3_sitearch}/gi/_gi_cairo*.so %{python3_sitearch}/pygtkcompat/ -%{python3_sitelib}/PyGObject-*.egg-info +%{python3_sitearch}/PyGObject-*.egg-info %files devel %{_includedir}/pygobject-3.0/pygobject.h @@ -140,5 +146,14 @@ popd %{_libdir}/pkgconfig/pygobject-3.0.pc %changelog +* Fri Jan 19 2024 liubo - 3.36.1-3 +- Description Failed to repair the rpmbuild-ba command + +* Sat May 22 2021 wangchen - 3.36.1-2 +- enable check test suite + +* Wed Aug 26 2020 wangchen - 3.36.1-1 +- update to 3.36.1 + * Fri Sep 20 2019 openEuler Buildteam - 3.30.1-2 - Package init