diff --git a/backport-fixes-for-python-3.9.patch b/backport-fixes-for-python-3.9.patch deleted file mode 100644 index 6bbaeff774f1b6409eb8391f3ef75246d094323a..0000000000000000000000000000000000000000 --- a/backport-fixes-for-python-3.9.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 426ae35bee1fa0fdb8b5120b1dcd20cee6e34512 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Mon, 1 Jun 2020 12:24:16 +0200 -Subject: [PATCH] xcbgen: Use math.gcd() for Python >= 3.5. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -fractions.gcd() has been deprecated since Python 3.5, and -was finally dropped in Python 3.9. It is recommended to -use math.gcd() instead. - -Signed-off-by: Bj枚rn Esser - -Conflict:NA -Reference:https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512 - ---- - xcbgen/align.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/xcbgen/align.py b/xcbgen/align.py -index d4c12ee..5c4f517 100644 ---- a/xcbgen/align.py -+++ b/xcbgen/align.py -@@ -2,7 +2,12 @@ - This module contains helper classes for alignment arithmetic and checks - ''' - --from fractions import gcd -+from sys import version_info -+ -+if version_info[:2] >= (3, 5): -+ from math import gcd -+else: -+ from fractions import gcd - - class Alignment(object): - --- -GitLab - diff --git a/xcb-proto-1.14.tar.gz b/xcb-proto-1.14.tar.gz deleted file mode 100644 index f19dc9d2f7ee601d8d24eb104b1a2da25521a4f2..0000000000000000000000000000000000000000 Binary files a/xcb-proto-1.14.tar.gz and /dev/null differ diff --git a/xcb-proto-1.15.tar.gz b/xcb-proto-1.15.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b31a4cb501ca5b04b3a5785727bcbec5e498ccdb Binary files /dev/null and b/xcb-proto-1.15.tar.gz differ diff --git a/xcb-proto.spec b/xcb-proto.spec index 617e67064d43a6f66335b82be1a9f15536ebbc96..9535e2829f76a0dd8daff04e6000cf5d3968c2c0 100644 --- a/xcb-proto.spec +++ b/xcb-proto.spec @@ -1,14 +1,12 @@ %define debug_package %{nil} Name: xcb-proto -Version: 1.14 -Release: 2 +Version: 1.15 +Release: 1 Summary: XCB protocol descriptions License: MIT URL: https://xcb.freedesktop.org/ Source0: https://xcb.freedesktop.org/dist/%{name}-%{version}.tar.gz -Patch6000: backport-fixes-for-python-3.9.patch - BuildArch: noarch BuildRequires: python3-devel @@ -23,7 +21,6 @@ to the protocol, improved threading support, and extensibility. %autosetup -n %{name}-%{version} -p1 %build -export PYTHON="python3" %configure --libdir=%{_datadir} %make_build @@ -39,6 +36,9 @@ export PYTHON="python3" %{python3_sitelib}/xcbgen %changelog +* Thu Oct 27 2022 wangkerong - 1.15-1 +- upgrade to 1.15 + * Sat Jan 08 2022 dongyuzhen - 1.14-2 - Type:bugfix - CVE:NA