From 6385ef2ce5f2fa806a928df33ce37eae91e5b85f9566602cbcc9787684df0be5 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Tue, 21 Dec 2021 22:57:18 +0000
Subject: [PATCH] Accepting request 941983 from
 home:bnavigator:python-rpm-macros

- Update to v4.81
  * fix some typo's in docs
  * corrected some minor other things in docs
  * Python 3.9 is now included in the unit test runs
  * No actual code changes.
- (update just to satisfy the weekly report on d:l:python* scripts)
- Add patch Pyro4-pr238-py310-cmethod-smethod.patch
  * gh#irmen/Pyro4#238

OBS-URL: https://build.opensuse.org/request/show/941983
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Pyro4?expand=0&rev=23
---
 Pyro4-4.80.tar.gz                       |  3 ---
 Pyro4-4.81.tar.gz                       |  3 +++
 Pyro4-pr238-py310-cmethod-smethod.patch | 13 +++++++++++++
 python-Pyro4.changes                    | 12 ++++++++++++
 python-Pyro4.spec                       | 12 +++++++-----
 5 files changed, 35 insertions(+), 8 deletions(-)
 delete mode 100644 Pyro4-4.80.tar.gz
 create mode 100644 Pyro4-4.81.tar.gz
 create mode 100644 Pyro4-pr238-py310-cmethod-smethod.patch

diff --git a/Pyro4-4.80.tar.gz b/Pyro4-4.80.tar.gz
deleted file mode 100644
index 0fb1e29..0000000
--- a/Pyro4-4.80.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:46847ca703de3f483fbd0b2d22622f36eff03e6ef7ec7704d4ecaa3964cb2220
-size 515103
diff --git a/Pyro4-4.81.tar.gz b/Pyro4-4.81.tar.gz
new file mode 100644
index 0000000..bf04f1d
--- /dev/null
+++ b/Pyro4-4.81.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e130da06478b813173b959f7013d134865e07fbf58cc5f1a2598f99479cdac5f
+size 514678
diff --git a/Pyro4-pr238-py310-cmethod-smethod.patch b/Pyro4-pr238-py310-cmethod-smethod.patch
new file mode 100644
index 0000000..a442025
--- /dev/null
+++ b/Pyro4-pr238-py310-cmethod-smethod.patch
@@ -0,0 +1,13 @@
+Index: Pyro4-4.81/src/Pyro4/core.py
+===================================================================
+--- Pyro4-4.81.orig/src/Pyro4/core.py
++++ Pyro4-4.81/src/Pyro4/core.py
+@@ -987,7 +987,7 @@ def expose(method_or_class):
+         func._pyroExposed = True
+         return method_or_class
+     attrname = getattr(method_or_class, "__name__", None)
+-    if not attrname:
++    if not attrname or isinstance(method_or_class, (classmethod, staticmethod)):
+         # we could be dealing with a descriptor (classmethod/staticmethod), this means the order of the decorators is wrong
+         if inspect.ismethoddescriptor(method_or_class):
+             attrname = method_or_class.__get__(None, dict).__name__
diff --git a/python-Pyro4.changes b/python-Pyro4.changes
index 3099463..91c91a8 100644
--- a/python-Pyro4.changes
+++ b/python-Pyro4.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Dec 21 18:29:33 UTC 2021 - Ben Greiner <code@bnavigator.de>
+
+- Update to v4.81
+  * fix some typo's in docs
+  * corrected some minor other things in docs
+  * Python 3.9 is now included in the unit test runs
+  * No actual code changes.
+- (update just to satisfy the weekly report on d:l:python* scripts)
+- Add patch Pyro4-pr238-py310-cmethod-smethod.patch
+  * gh#irmen/Pyro4#238
+
 -------------------------------------------------------------------
 Fri Feb 26 05:42:18 UTC 2021 - John Vandenberg <jayvdb@gmail.com>
 
diff --git a/python-Pyro4.spec b/python-Pyro4.spec
index be245af..e747eb4 100644
--- a/python-Pyro4.spec
+++ b/python-Pyro4.spec
@@ -19,18 +19,20 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %bcond_without python2
 Name:           python-Pyro4
-Version:        4.80
+Version:        4.81
 Release:        0
 Summary:        Distributed object middleware for Python (RPC)
 License:        MIT
 URL:            https://github.com/irmen/Pyro4
 Source:         https://files.pythonhosted.org/packages/source/P/Pyro4/Pyro4-%{version}.tar.gz
 BuildRequires:  %{python_module setuptools}
+# PATCH-FIX-UPSTREAM Pyro4-pr238-py310-cmethod-smethod.patch gh#irmen/Pyro4#238
+Patch0:         Pyro4-pr238-py310-cmethod-smethod.patch
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-serpent >= 1.27
 Requires(post): update-alternatives
-Requires(postun): update-alternatives
+Requires(postun):update-alternatives
 Recommends:     ca-certificates
 Recommends:     python-cloudpickle >= 0.4.0
 Recommends:     python-dill >= 0.2.6
@@ -64,7 +66,7 @@ building distributed applications. Pyro is a pure Python library and
 runs on many different platforms and Python versions.
 
 %prep
-%setup -q -n Pyro4-%{version}
+%autosetup -p1 -n Pyro4-%{version}
 
 %build
 %python_build
@@ -80,7 +82,6 @@ runs on many different platforms and Python versions.
 %python_clone -a %{buildroot}%{_bindir}/pyro4-test-echoserver
 
 %check
-# testContextAndSock missing cert fixtures https://github.com/irmen/Pyro4/issues/216
 # socket tests require at least lo interface thus skip them
 skip="testContextAndSock"
 skip+=" or testGetIP or testAutoClean"
@@ -115,6 +116,7 @@ export PYTHONPATH=${PWD}/tests/PyroTests
 %python_alternative %{_bindir}/pyro4-ns
 %python_alternative %{_bindir}/pyro4-nsc
 %python_alternative %{_bindir}/pyro4-test-echoserver
-%{python_sitelib}/*
+%{python_sitelib}/Pyro4
+%{python_sitelib}/Pyro4-%{version}*-info
 
 %changelog