From ec38480756b6025fcb99e31c8d01a5ec00d9cc602280367fb696b506be17498f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 26 May 2025 11:59:14 +0000 Subject: [PATCH 1/3] - Convert to pip-based build OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dist?expand=0&rev=8 --- python-dist.changes | 5 +++++ python-dist.spec | 12 +++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/python-dist.changes b/python-dist.changes index 8fc3864..8c2a1f3 100644 --- a/python-dist.changes +++ b/python-dist.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 26 11:58:58 UTC 2025 - Markéta Machová + +- Convert to pip-based build + ------------------------------------------------------------------- Thu Apr 13 10:37:20 UTC 2023 - pgajdos@suse.com diff --git a/python-dist.spec b/python-dist.spec index 93804b9..98d24de 100644 --- a/python-dist.spec +++ b/python-dist.spec @@ -1,7 +1,7 @@ # # spec file for package python-dist # -# Copyright (c) 2023 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,7 +16,6 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-dist Version: 1.0.3 Release: 0 @@ -28,7 +27,9 @@ Source: https://github.com/duboviy/dist/archive/%{version}.tar.gz # https://github.com/duboviy/dist/issues/8 Patch0: python-dist-no-six.patch BuildRequires: %{python_module devel} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: unzip @@ -47,10 +48,10 @@ that is almost 3 times faster than similar fast pure python implementation. %build export CFLAGS="%{optflags}" -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitearch} %check @@ -59,6 +60,7 @@ export CFLAGS="%{optflags}" %files %{python_files} %license LICENSE.txt %doc README.md -%{python_sitearch}/* +%{python_sitearch}/dist +%{python_sitearch}/dist-%{version}*-info %changelog From f6ee271f1f81b916404fae06285f7bef8762320d275f8d1897f8e8c54e9bf612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Mon, 26 May 2025 12:14:26 +0000 Subject: [PATCH 2/3] Accepting request 1280226 from devel:languages:python revert, packaging broken OBS-URL: https://build.opensuse.org/request/show/1280226 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dist?expand=0&rev=9 --- python-dist.changes | 5 ----- python-dist.spec | 12 +++++------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/python-dist.changes b/python-dist.changes index 8c2a1f3..8fc3864 100644 --- a/python-dist.changes +++ b/python-dist.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon May 26 11:58:58 UTC 2025 - Markéta Machová - -- Convert to pip-based build - ------------------------------------------------------------------- Thu Apr 13 10:37:20 UTC 2023 - pgajdos@suse.com diff --git a/python-dist.spec b/python-dist.spec index 98d24de..93804b9 100644 --- a/python-dist.spec +++ b/python-dist.spec @@ -1,7 +1,7 @@ # # spec file for package python-dist # -# Copyright (c) 2025 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,6 +16,7 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-dist Version: 1.0.3 Release: 0 @@ -27,9 +28,7 @@ Source: https://github.com/duboviy/dist/archive/%{version}.tar.gz # https://github.com/duboviy/dist/issues/8 Patch0: python-dist-no-six.patch BuildRequires: %{python_module devel} -BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: unzip @@ -48,10 +47,10 @@ that is almost 3 times faster than similar fast pure python implementation. %build export CFLAGS="%{optflags}" -%pyproject_wheel +%python_build %install -%pyproject_install +%python_install %python_expand %fdupes %{buildroot}%{$python_sitearch} %check @@ -60,7 +59,6 @@ export CFLAGS="%{optflags}" %files %{python_files} %license LICENSE.txt %doc README.md -%{python_sitearch}/dist -%{python_sitearch}/dist-%{version}*-info +%{python_sitearch}/* %changelog From e3cbe52916c6306cdb3f1af018e0e28c962f37f777519508b75ff18112f54f54 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Thu, 5 Jun 2025 06:07:45 +0000 Subject: [PATCH 3/3] - Switch to pyproject macros. - No more greedy globs in %files. - Add patch fix-version-number.patch: * Actually have this report itself as the correct version. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-dist?expand=0&rev=10 --- fix-version-number.patch | 44 ++++++++++++++++++++++++++++++++++++++++ python-dist.changes | 8 ++++++++ python-dist.spec | 17 +++++++++------- 3 files changed, 62 insertions(+), 7 deletions(-) create mode 100644 fix-version-number.patch diff --git a/fix-version-number.patch b/fix-version-number.patch new file mode 100644 index 0000000..52e0830 --- /dev/null +++ b/fix-version-number.patch @@ -0,0 +1,44 @@ +From dc41696801eb78ce47ef3964fd5e057ef4a971b5 Mon Sep 17 00:00:00 2001 +From: Eugene Dubovoy +Date: Mon, 30 Jan 2017 22:57:09 +0200 +Subject: [PATCH] Prepare to PyPI release of version 1.0.2 + +--- + README.md | 3 +++ + setup.py | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/README.md b/README.md +index c9bb451..2c5b363 100644 +--- a/README.md ++++ b/README.md +@@ -17,7 +17,10 @@ Installation + ------------ + + python setup.py install ++ ++Or using alternative command: + ++ pip install https://github.com/duboviy/dist/archive/master.zip + + Input and output data + ---------- +diff --git a/setup.py b/setup.py +index bd264d3..ba865f3 100644 +--- a/setup.py ++++ b/setup.py +@@ -12,12 +12,12 @@ + + setup( + name="dist", +- version="1.0.2", ++ version="1.0.3", + description="Compute distance between two coordinates on the map", + author='Eugene Duboviy', + author_email='eugene.dubovoy@gmail.com', + url='https://github.com/duboviy/dist', +- download_url = 'https://github.com/duboviy/dist/tarball/1.0.2', ++ download_url = 'https://github.com/duboviy/dist/tarball/1.0.3', + keywords = ['distance', 'coordinates', 'map', 'performance'], + classifiers=[ + "Programming Language :: Python", diff --git a/python-dist.changes b/python-dist.changes index 8fc3864..db71c4f 100644 --- a/python-dist.changes +++ b/python-dist.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jun 5 06:03:04 UTC 2025 - Steve Kowalik + +- Switch to pyproject macros. +- No more greedy globs in %files. +- Add patch fix-version-number.patch: + * Actually have this report itself as the correct version. + ------------------------------------------------------------------- Thu Apr 13 10:37:20 UTC 2023 - pgajdos@suse.com diff --git a/python-dist.spec b/python-dist.spec index 93804b9..dc78290 100644 --- a/python-dist.spec +++ b/python-dist.spec @@ -1,7 +1,7 @@ # # spec file for package python-dist # -# Copyright (c) 2023 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,19 +16,21 @@ # -%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-dist Version: 1.0.3 Release: 0 Summary: Compute distance between two coordinates on the map License: MIT -Group: Development/Languages/Python URL: https://github.com/duboviy/dist Source: https://github.com/duboviy/dist/archive/%{version}.tar.gz +# PATCH-FIX-UPSTREAM gh#duboviy/dist#dc41696801eb78ce47ef3964fd5e057ef4a971b5 +Patch0: fix-version-number.patch # https://github.com/duboviy/dist/issues/8 -Patch0: python-dist-no-six.patch +Patch1: python-dist-no-six.patch BuildRequires: %{python_module devel} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: unzip @@ -47,10 +49,10 @@ that is almost 3 times faster than similar fast pure python implementation. %build export CFLAGS="%{optflags}" -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitearch} %check @@ -59,6 +61,7 @@ export CFLAGS="%{optflags}" %files %{python_files} %license LICENSE.txt %doc README.md -%{python_sitearch}/* +%{python_sitearch}/dist.cpython-*-linux-gnu.so +%{python_sitearch}/dist-%{version}.dist-info %changelog