Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-kombu for openSUSE:Factory
checked in at 2023-02-23 16:28:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-kombu (Old)
and /work/SRC/openSUSE:Factory/.python-kombu.new.1706 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kombu"
Thu Feb 23 16:28:34 2023 rev:76 rq:1067310 version:5.2.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-kombu/python-kombu.changes
2022-03-23 20:15:43.046372436 +0100
+++ /work/SRC/openSUSE:Factory/.python-kombu.new.1706/python-kombu.changes
2023-02-23 16:46:44.998812437 +0100
@@ -1,0 +2,7 @@
+Thu Feb 23 06:08:55 UTC 2023 - Steve Kowalik <steven.kowa...@suse.com>
+
+- Add patch support-pyro-5.patch:
+ * Use Pyro5's compatability layer.
+- Switch BuildRequires to Pyro5.
+
+-------------------------------------------------------------------
New:
----
support-pyro-5.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-kombu.spec ++++++
--- /var/tmp/diff_new_pack.KFd8Uk/_old 2023-02-23 16:46:45.434815098 +0100
+++ /var/tmp/diff_new_pack.KFd8Uk/_new 2023-02-23 16:46:45.442815148 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-kombu
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,6 @@
#
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define skip_python2 1
Name: python-kombu
Version: 5.2.4
Release: 0
@@ -25,9 +23,12 @@
License: BSD-3-Clause
URL: https://github.com/celery/kombu
Source:
https://files.pythonhosted.org/packages/source/k/kombu/kombu-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE Use Pyro4 compatibility for now, upstream should switch
+# for 5.3
+Patch0: support-pyro-5.patch
BuildRequires: %{python_module Brotli >= 1.0.0}
BuildRequires: %{python_module PyYAML >= 3.10}
-BuildRequires: %{python_module Pyro4}
+BuildRequires: %{python_module Pyro5}
BuildRequires: %{python_module SQLAlchemy}
BuildRequires: %{python_module amqp >= 5.0.9}
BuildRequires: %{python_module boto3 >= 1.9.12}
@@ -67,7 +68,7 @@
provide proven and tested solutions to common messaging problems.
%prep
-%setup -q -n kombu-%{version}
+%autosetup -p1 -n kombu-%{version}
# pinned dependencies are bad
sed -i -e 's:==:>=:g' requirements/*.txt requirements/extras/*.txt
# we don't want to pull in the whole azure stack because of few tests of a
non-essential feature
++++++ support-pyro-5.patch ++++++
Index: kombu-5.2.4/kombu/transport/pyro.py
===================================================================
--- kombu-5.2.4.orig/kombu/transport/pyro.py
+++ kombu-5.2.4/kombu/transport/pyro.py
@@ -42,9 +42,9 @@ from kombu.utils.objects import cached_p
from . import virtual
try:
- import Pyro4 as pyro
- from Pyro4.errors import NamingError
- from Pyro4.util import SerializerBase
+ from Pyro5.compatibility import Pyro4 as pyro
+ from Pyro5.errors import NamingError
+ from Pyro5.api import SerializerBase
except ImportError: # pragma: no cover
pyro = NamingError = SerializerBase = None
