diff --git a/keyring-util-properties.patch b/keyring-util-properties.patch new file mode 100644 index 0000000..3e057a8 --- /dev/null +++ b/keyring-util-properties.patch @@ -0,0 +1,24 @@ +--- + keyutils/backend.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/keyutils/backend.py ++++ b/keyutils/backend.py +@@ -3,7 +3,7 @@ + import errno + + from keyring.backend import KeyringBackend +-from keyring.util import properties ++from jaraco.classes import properties + from keyring.errors import PasswordDeleteError + + from keyutils.keys import session_keyring +@@ -20,7 +20,7 @@ class KeyutilsKeyringBackend(KeyringBack + self._key_type = key_type + self._payload_encoding = payload_encoding + +- @properties.ClassProperty ++ @properties.classproperty + @classmethod + def priority(cls): + return 1 diff --git a/python-keyring-keyutils.changes b/python-keyring-keyutils.changes index 2fcf87a..dcc8eba 100644 --- a/python-keyring-keyutils.changes +++ b/python-keyring-keyutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 24 08:25:40 UTC 2023 - Matej Cepl + +- Add keyring-util-properties.patch fixing incompatibility with + keyring 23.9.0 (gh#marcus-h/python-keyring-keyutils!3). + ------------------------------------------------------------------- Thu Jul 6 11:46:27 UTC 2023 - ecsos diff --git a/python-keyring-keyutils.spec b/python-keyring-keyutils.spec index 7936547..d4e2b20 100644 --- a/python-keyring-keyutils.spec +++ b/python-keyring-keyutils.spec @@ -1,7 +1,7 @@ # # spec file for package python-keyring-keyutils # -# Copyright (c) 2021 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 @@ -24,10 +24,15 @@ Summary: A python-keyring backend for the kernel keyring License: MIT URL: https://github.com/marcus-h/python-keyring-keyutils Source: keyring-keyutils-%{version}.tar.gz - +# PATCH-FIX-UPSTREAM keyring-util-properties.patch gh#jaraco/keyring#593 mcepl@suse.com +# this patch makes things totally awesome +Patch0: keyring-util-properties.patch BuildRequires: %{python_module devel} +BuildRequires: %{python_module jaraco.classes} BuildRequires: %{python_module keyring} +BuildRequires: %{python_module pip} BuildRequires: %{python_module pytest} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: keyutils-devel BuildRequires: python-rpm-macros @@ -47,13 +52,13 @@ keyring. In particular, this package ships [2] https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git %prep -%setup -q -n keyring-keyutils-%{version} +%autosetup -p1 -n keyring-keyutils-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitearch} %check @@ -75,6 +80,6 @@ gcc -Wall -o skip_test_key_too_large_serial skip_test_key_too_large_serial.c %doc README.md README_osc.md %license LICENSE %{python_sitearch}/keyutils -%{python_sitearch}/keyring_keyutils-%{version}-py*.egg-info +%{python_sitearch}/keyring_keyutils-%{version}*-info %changelog