From 0a492b62b182da2b8cbe4003a2855fb804e9f892fec757a7519b0e3ffa7eeb3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 2 Jun 2025 14:49:28 +0000 Subject: [PATCH 1/2] - Convert to pip-based build OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-nwdiag?expand=0&rev=15 --- python-nwdiag.changes | 5 +++++ python-nwdiag.spec | 17 +++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/python-nwdiag.changes b/python-nwdiag.changes index 18e2cd9..1cab1e6 100644 --- a/python-nwdiag.changes +++ b/python-nwdiag.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 2 14:49:06 UTC 2025 - Markéta Machová + +- Convert to pip-based build + ------------------------------------------------------------------- Tue Jul 19 12:15:58 UTC 2022 - Dirk Müller diff --git a/python-nwdiag.spec b/python-nwdiag.spec index 63fe65a..0199db6 100644 --- a/python-nwdiag.spec +++ b/python-nwdiag.spec @@ -1,7 +1,7 @@ # # spec file for package python-nwdiag # -# Copyright (c) 2022 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 @@ -16,8 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} -%global skip_python2 1 Name: python-nwdiag Version: 3.0.0 Release: 0 @@ -26,13 +24,15 @@ License: Apache-2.0 Group: Development/Languages/Python URL: http://blockdiag.com/ Source: https://files.pythonhosted.org/packages/source/n/nwdiag/nwdiag-%{version}.tar.gz +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-blockdiag >= 1.5.0 Requires: python-setuptools -Requires(post): update-alternatives -Requires(postun):update-alternatives +Requires(post): alts +Requires(postun): alts Suggests: python-docutils Suggests: python-nose Suggests: python-reportlab @@ -46,10 +46,10 @@ nwdiag generates network diagram images from text. %setup -q -n nwdiag-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_clone -a %{buildroot}%{_bindir}/packetdiag %python_clone -a %{buildroot}%{_bindir}/rackdiag %python_clone -a %{buildroot}%{_bindir}/nwdiag @@ -71,6 +71,7 @@ nwdiag generates network diagram images from text. %python_alternative %{_bindir}/nwdiag %python_alternative %{_bindir}/rackdiag %python_alternative %{_bindir}/packetdiag -%{python_sitelib}/* +%{python_sitelib}/nwdiag +%{python_sitelib}/nwdiag-%{version}*-info %changelog From c4778cc585b972b3b20bd544b5f6fb3c65d3348e8b095d999c7c01a7e80eab5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 2 Jun 2025 14:52:43 +0000 Subject: [PATCH 2/2] fix files OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-nwdiag?expand=0&rev=16 --- python-nwdiag.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python-nwdiag.spec b/python-nwdiag.spec index 0199db6..e7c9983 100644 --- a/python-nwdiag.spec +++ b/python-nwdiag.spec @@ -72,6 +72,8 @@ nwdiag generates network diagram images from text. %python_alternative %{_bindir}/rackdiag %python_alternative %{_bindir}/packetdiag %{python_sitelib}/nwdiag +%{python_sitelib}/rackdiag +%{python_sitelib}/packetdiag %{python_sitelib}/nwdiag-%{version}*-info %changelog