diff --git a/python-pyrad.changes b/python-pyrad.changes index bd157b9..475fccf 100644 --- a/python-pyrad.changes +++ b/python-pyrad.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 10 03:56:53 UTC 2025 - Steve Kowalik + +- Add patch support-poetry-core-2.patch: + * Support poetry-core 2.0 changes. + ------------------------------------------------------------------- Fri Sep 20 10:59:54 UTC 2024 - Johannes Kastl diff --git a/python-pyrad.spec b/python-pyrad.spec index 2637550..65df834 100644 --- a/python-pyrad.spec +++ b/python-pyrad.spec @@ -1,7 +1,7 @@ # # spec file for package python-pyrad # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,8 @@ URL: https://github.com/pyradius/pyrad Source0: https://github.com/pyradius/pyrad/archive/%{version}.tar.gz # PATCH-FIX-UPSTREAM gh#pyradius/pyrad#162 Patch0: use-correct-assertion-methods.patch +# PATCH-FIX-UPSTREAM Based on gh#pyradius/pyrad#208 +Patch1: support-poetry-core-2.patch BuildRequires: %{python_module netaddr} BuildRequires: %{python_module pip} BuildRequires: %{python_module poetry} @@ -52,8 +54,6 @@ them and decoding responses. %install %pyproject_install -# Do not install the examples into site-packages -%python_expand rm -r %{buildroot}%{$python_sitelib}/example %python_expand %fdupes %{buildroot}%{$python_sitelib} %check diff --git a/support-poetry-core-2.patch b/support-poetry-core-2.patch new file mode 100644 index 0000000..00d158d --- /dev/null +++ b/support-poetry-core-2.patch @@ -0,0 +1,51 @@ +From d17438da2008f48aa13cc95a626c990bf645799a Mon Sep 17 00:00:00 2001 +From: Luca Barbieri +Date: Wed, 8 Jan 2025 10:35:22 +0100 +Subject: [PATCH 1/2] Fix pyproject.toml format + +Fix pyproject format to correctly build with poetry-core 2.0.0 +--- + pyproject.toml | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +Index: pyrad-2.4/pyproject.toml +=================================================================== +--- pyrad-2.4.orig/pyproject.toml ++++ pyrad-2.4/pyproject.toml +@@ -2,16 +2,16 @@ + requires = ["poetry>=1.0"] + build-backend = "poetry.masonry.api" + +-[tool.poetry] ++[project] + name = "pyrad" + version= "2.4" + readme = "README.rst" + license = "BSD-3-Clause" + description="RADIUS tools" + authors = [ +- "Istvan Ruzman ", +- "Christian Giese ", +-] ++ { name = "Istvan Ruzman", email = "istvan@ruzman.eu" }, ++ { name = "Christian Giese", email = "developer@gicnet.de" }, ++ ] + keywords = ["AAA", "accounting", "authentication", "authorization", "RADIUS"] + classifiers = [ + "Development Status :: 6 - Mature", +@@ -28,7 +28,7 @@ include = [ + "example/*" + ] + +-[tool.poetry.urls] ++[project.urls] + repository = "https://github.com/pyradius/pyrad" + + [tool.poetry.dependencies] +@@ -36,5 +36,5 @@ python = "^2.7 || ^3.6" + six = "^1.15.0" + netaddr = "^0.8" + +-[tool.poetry.dev-dependencies] ++[tool.poetry.group.dev.dependencies] + nose = "^0.10.0b1"