python3 Mapping function change lead to build failed

This commit is contained in:
shirely16 2022-04-16 10:30:44 +08:00
parent c275be7839
commit ac38617c7a
2 changed files with 34 additions and 1 deletions

View File

@ -1,11 +1,13 @@
Name: babeltrace
Version: 1.5.8
Release: 3
Release: 4
Summary: Common Trace Format Babel Tower
License: MIT and GPLv2
URL: https://www.efficios.com/babeltrace
Source0: https://www.efficios.com/files/%{name}/%{name}-%{version}.tar.bz2
Patch9000: backport-python3-Mapping-function-change-lead-to-build-failed.patch
BuildRequires: bison >= 2.4 flex >= 2.5.35 glib2-devel >= 2.22.0
BuildRequires: popt-devel >= 1.13 swig >= 2.0 elfutils-devel >= 0.154
BuildRequires: libuuid-devel python3-devel libtool gcc perl-Test-Harness chrpath
@ -62,6 +64,7 @@ chrpath --delete %{buildroot}%{_libdir}/*.so.*
make check
%pre
%autosetup -n babeltrace-%{version} -p1
%preun
@ -89,6 +92,9 @@ make check
%{_mandir}/man1/*.1.gz
%changelog
* Sat Apr 16 2022 hanhui <hanhui15@h-partners.com> - 1.5.8-4
- Desc:python3 Mapping function change lead to build failed
* Sat Sep 4 2021 Hongxun Ren<renhongxun@huawei.com> - 1.5.8-3
- Type:enhancement
- ID:NA

View File

@ -0,0 +1,27 @@
From a01c13636e229fb7766123c9597ffcecfe308c5d Mon Sep 17 00:00:00 2001
From: hanhui <hanhui15@h-partners.com>
Date: Sat, 16 Apr 2022 08:58:37 +0800
Subject: [PATCH] python3.10,Mapping function change lead to babeltrace build failed
---
bindings/python/babeltrace/babeltrace.i.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bindings/python/babeltrace/babeltrace.i.in b/bindings/python/babeltrace/babeltrace.i.in
index a773e9b..7cd3855 100644
--- a/bindings/python/babeltrace/babeltrace.i.in
+++ b/bindings/python/babeltrace/babeltrace.i.in
@@ -672,8 +672,8 @@ class CTFScope:
_scopes = [CTFScope.EVENT_FIELDS, CTFScope.EVENT_CONTEXT, CTFScope.STREAM_EVENT_CONTEXT,
CTFScope.STREAM_EVENT_HEADER, CTFScope.STREAM_PACKET_CONTEXT, CTFScope.TRACE_PACKET_HEADER]
-import collections
-class Event(collections.Mapping):
+import collections.abc
+class Event(collections.abc.Mapping):
"""
This class represents an event from the trace.
It is obtained using the TraceCollection generator functions.
--
2.33.0