diff --git a/.gitignore b/.gitignore index 919bada..5b0303e 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ /gobject-introspection-1.63.1.tar.xz /gobject-introspection-1.63.2.tar.xz /gobject-introspection-1.64.0.tar.xz +/gobject-introspection-1.64.1.tar.xz diff --git a/0001-Replace-calls-to-deprecated-xml.etree.cElementTree.patch b/0001-Replace-calls-to-deprecated-xml.etree.cElementTree.patch deleted file mode 100644 index b47233e..0000000 --- a/0001-Replace-calls-to-deprecated-xml.etree.cElementTree.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8ceb23621d7e59718c1d512155aae8e8eb17db56 Mon Sep 17 00:00:00 2001 -From: Stephen Gallagher -Date: Thu, 26 Mar 2020 15:17:37 -0400 -Subject: [PATCH] Replace calls to deprecated xml.etree.cElementTree - -cElementTree was removed in Python 3.9 in favor of ElementTree, -which has used a fast, native implementation since Python 3.3. - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1817649 - -Signed-off-by: Stephen Gallagher ---- - giscanner/gdumpparser.py | 2 +- - giscanner/girparser.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py -index 1730fee5..e7ccf575 100644 ---- a/giscanner/gdumpparser.py -+++ b/giscanner/gdumpparser.py -@@ -22,7 +22,7 @@ import os - import sys - import tempfile - import subprocess --from xml.etree.cElementTree import parse -+from xml.etree.ElementTree import parse - - from . import ast - from . import message -diff --git a/giscanner/girparser.py b/giscanner/girparser.py -index 0a6c687b..35206a41 100644 ---- a/giscanner/girparser.py -+++ b/giscanner/girparser.py -@@ -21,7 +21,7 @@ - import os - - from collections import OrderedDict --from xml.etree.cElementTree import parse -+from xml.etree.ElementTree import parse - - from . import ast - from .girwriter import COMPATIBLE_GIR_VERSION --- -2.25.2 - diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 2e26672..e1d0fca 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -3,17 +3,14 @@ %global __python %{__python3} Name: gobject-introspection -Version: 1.64.0 -Release: 2%{?dist} +Version: 1.64.1 +Release: 1%{?dist} Summary: Introspection system for GObject-based libraries License: GPLv2+, LGPLv2+, MIT URL: https://wiki.gnome.org/Projects/GObjectIntrospection Source0: https://download.gnome.org/sources/gobject-introspection/1.64/%{name}-%{version}.tar.xz -# Fix the build with Python 3.9 -Patch0: 0001-Replace-calls-to-deprecated-xml.etree.cElementTree.patch - BuildRequires: gcc BuildRequires: bison BuildRequires: cairo-gobject-devel @@ -89,6 +86,9 @@ Libraries and headers for gobject-introspection %{_mandir}/man1/g-ir-scanner.1* %changelog +* Sun Apr 05 2020 Kalev Lember - 1.64.1-1 +- Update to 1.64.1 + * Thu Mar 26 2020 Kalev Lember - 1.64.0-2 - Fix the build with Python 3.9 (#1817649) diff --git a/sources b/sources index ed82ebd..f06fac5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gobject-introspection-1.64.0.tar.xz) = d1960424d82dea1f1d36a7c3f9922029e751e77da8dc6904c24750babe7c3f4c11a6795eb218aab342ccbb6326d0ac3eac2c2c903e90b146f4e28c0f413da1ae +SHA512 (gobject-introspection-1.64.1.tar.xz) = 7610871f7ed5778ea9813062ed6465d131af58c00bdea1bb51dde7f98f459f44ae453eb6d0c5bdc6f7dcd92d639816f4e0773ccd5673cd065d22dabc6448647c