From f6997a31a1b7aec3498d40c6399176cd7d2fdd16abd4b45a7bbcba1bf4fd364b Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Fri, 14 Feb 2025 03:18:09 +0000 Subject: [PATCH] - Switch to pyproject macros. - Stop using libdir macro, which now doesn't return /usr/lib64. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Rtree?expand=0&rev=6 --- python-Rtree.changes | 6 ++++++ python-Rtree.spec | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/python-Rtree.changes b/python-Rtree.changes index 95e3e2f..c699375 100644 --- a/python-Rtree.changes +++ b/python-Rtree.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 14 03:17:29 UTC 2025 - Steve Kowalik + +- Switch to pyproject macros. +- Stop using libdir macro, which now doesn't return /usr/lib64. + ------------------------------------------------------------------- Tue Sep 17 11:34:46 UTC 2024 - Nico Krapp diff --git a/python-Rtree.spec b/python-Rtree.spec index 671a505..fdbea52 100644 --- a/python-Rtree.spec +++ b/python-Rtree.spec @@ -1,7 +1,7 @@ # # spec file for package python-Rtree # -# 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 @@ -36,7 +36,8 @@ BuildRequires: fdupes # only for the shlib requirement, no headers needed BuildRequires: spatialindex-devel BuildRequires: python-rpm-macros -Requires: %(rpm -q --queryformat "%%{NAME}" -f $(readlink -f %{_libdir}/libspatialindex.so)) +# Since this is noarch, _libdir doesn't work for 64 bit arches +Requires: %(rpm -q --queryformat "%%{NAME}" -f $(readlink -f /usr/lib*/libspatialindex.so)) Provides: python-rtree = %{version}-%{release} BuildArch: noarch %python_subpackages @@ -59,10 +60,10 @@ spatial indexing features for the spatially curious Python user. %autosetup -p1 -n rtree-%{version} %build -%python_build +%pyproject_wheel %install -%python_install +%pyproject_install %python_expand %fdupes %{buildroot}%{$python_sitelib} %check @@ -72,6 +73,6 @@ spatial indexing features for the spatially curious Python user. %doc README.md %license LICENSE.txt %{python_sitelib}/rtree -%{python_sitelib}/Rtree-%{version}*-info +%{python_sitelib}/Rtree-%{version}.dist-info %changelog