pg_activity: Switch to pyproject build

diff --git a/rpm/redhat/main/common/pg_activity/EL-10/pg_activity-3.6.1-pyproject.patch b/rpm/redhat/main/common/pg_activity/EL-10/pg_activity-3.6.1-pyproject.patch
new file mode 120000 (symlink)
index 0000000..02ac3cf
--- /dev/null
+++ b/rpm/redhat/main/common/pg_activity/EL-10/pg_activity-3.6.1-pyproject.patch
@@ -0,0 +1 @@
+../main/pg_activity-3.6.1-pyproject.patch
\ No newline at end of file

diff --git a/rpm/redhat/main/common/pg_activity/EL-8/pg_activity-3.6.1-pyproject.patch b/rpm/redhat/main/common/pg_activity/EL-8/pg_activity-3.6.1-pyproject.patch
new file mode 120000 (symlink)
index 0000000..02ac3cf
--- /dev/null
+++ b/rpm/redhat/main/common/pg_activity/EL-8/pg_activity-3.6.1-pyproject.patch
@@ -0,0 +1 @@
+../main/pg_activity-3.6.1-pyproject.patch
\ No newline at end of file

diff --git a/rpm/redhat/main/common/pg_activity/EL-9/pg_activity-3.6.1-pyproject.patch b/rpm/redhat/main/common/pg_activity/EL-9/pg_activity-3.6.1-pyproject.patch
new file mode 120000 (symlink)
index 0000000..02ac3cf
--- /dev/null
+++ b/rpm/redhat/main/common/pg_activity/EL-9/pg_activity-3.6.1-pyproject.patch
@@ -0,0 +1 @@
+../main/pg_activity-3.6.1-pyproject.patch
\ No newline at end of file

diff --git a/rpm/redhat/main/common/pg_activity/F-41/pg_activity-3.6.1-pyproject.patch b/rpm/redhat/main/common/pg_activity/F-41/pg_activity-3.6.1-pyproject.patch
new file mode 120000 (symlink)
index 0000000..02ac3cf
--- /dev/null
+++ b/rpm/redhat/main/common/pg_activity/F-41/pg_activity-3.6.1-pyproject.patch
@@ -0,0 +1 @@
+../main/pg_activity-3.6.1-pyproject.patch
\ No newline at end of file

diff --git a/rpm/redhat/main/common/pg_activity/F-42/pg_activity-3.6.1-pyproject.patch b/rpm/redhat/main/common/pg_activity/F-42/pg_activity-3.6.1-pyproject.patch
new file mode 120000 (symlink)
index 0000000..02ac3cf
--- /dev/null
+++ b/rpm/redhat/main/common/pg_activity/F-42/pg_activity-3.6.1-pyproject.patch
@@ -0,0 +1 @@
+../main/pg_activity-3.6.1-pyproject.patch
\ No newline at end of file

diff --git a/rpm/redhat/main/common/pg_activity/F-43/pg_activity-3.6.1-pyproject.patch b/rpm/redhat/main/common/pg_activity/F-43/pg_activity-3.6.1-pyproject.patch
new file mode 120000 (symlink)
index 0000000..02ac3cf
--- /dev/null
+++ b/rpm/redhat/main/common/pg_activity/F-43/pg_activity-3.6.1-pyproject.patch
@@ -0,0 +1 @@
+../main/pg_activity-3.6.1-pyproject.patch
\ No newline at end of file

diff --git a/rpm/redhat/main/common/pg_activity/SLES-15/pg_activity-3.6.1-pyproject.patch b/rpm/redhat/main/common/pg_activity/SLES-15/pg_activity-3.6.1-pyproject.patch
new file mode 120000 (symlink)
index 0000000..02ac3cf
--- /dev/null
+++ b/rpm/redhat/main/common/pg_activity/SLES-15/pg_activity-3.6.1-pyproject.patch
@@ -0,0 +1 @@
+../main/pg_activity-3.6.1-pyproject.patch
\ No newline at end of file

diff --git a/rpm/redhat/main/common/pg_activity/SLES-16/pg_activity-3.6.1-pyproject.patch b/rpm/redhat/main/common/pg_activity/SLES-16/pg_activity-3.6.1-pyproject.patch
new file mode 120000 (symlink)
index 0000000..02ac3cf
--- /dev/null
+++ b/rpm/redhat/main/common/pg_activity/SLES-16/pg_activity-3.6.1-pyproject.patch
@@ -0,0 +1 @@
+../main/pg_activity-3.6.1-pyproject.patch
\ No newline at end of file

diff --git a/rpm/redhat/main/common/pg_activity/main/pg_activity-3.6.1-pyproject.patch b/rpm/redhat/main/common/pg_activity/main/pg_activity-3.6.1-pyproject.patch
new file mode 100644 (file)
index 0000000..06f4e1a
--- /dev/null
+++ b/rpm/redhat/main/common/pg_activity/main/pg_activity-3.6.1-pyproject.patch
@@ -0,0 +1,11 @@
+--- pyproject.toml.old 2025-06-03 16:35:03.000000000 +0300
++++ pyproject.toml     2025-10-06 12:26:32.133694137 +0300
+@@ -7,7 +7,7 @@
+ dynamic = ["version"]
+ description = "Command line tool for PostgreSQL server activity monitoring."
+ readme = "README.md"
+-license = "PostgreSQL"
++license = {text = "PostgreSQL"}
+ requires-python = ">=3.9"
+ authors = [
+     { name = "Julien Tachoires", email = "julmon@gmail.com" },

diff --git a/rpm/redhat/main/common/pg_activity/main/pg_activity.spec b/rpm/redhat/main/common/pg_activity/main/pg_activity.spec
index d9a57855fde2b993f1434c04ea6ce8c11bd83a07..0488f2db19dfb712e96f2a1490d6adbd842d1054 100644 (file)
--- a/rpm/redhat/main/common/pg_activity/main/pg_activity.spec
+++ b/rpm/redhat/main/common/pg_activity/main/pg_activity.spec
@@ -27,6 +27,7 @@ Release:      42PGDG%{?dist}
 License:       GPLv3
 Url:           https://github.com/dalibo/%{name}/
 Source0:       https://github.com/dalibo/%{name}/archive/v%{version}.tar.gz
+Patch0:                %{name}-3.6.1-pyproject.patch
 BuildArch:     noarch
 
 %if 0%{?rhel} == 8
@@ -75,25 +76,22 @@ top like application for PostgreSQL server activity monitoring.
 
 %prep
 %setup -q -n %{name}-%{version}
-
+%patch -P 0 -p0
 %build
 # Change the name of the Python module in the source code. SLES packages
 # this module in a different name:
 %if 0%{?suse_version} >= 1500
 find . -type f -exec sed -i 's/blessed/blessings/g' {} +
 %endif
-
-%{__ospython} setup.py build
+%pyproject_wheel
 
 %install
-%{__ospython} setup.py install -O1 --skip-build --root %{buildroot}
-%{__mkdir} -p %{buildroot}%{_mandir}/man1/
+%pyproject_install
 
 %files
 %defattr(-,root,root)
 %{_bindir}/%{name}
-%dir %{python_sitelib}/%{name}-%{version}-py%{pybasever}.egg-info/
-%{python_sitelib}/%{name}-%{version}-py%{pybasever}.egg-info/*
+%{python_sitelib}/%{name}-%{version}.dist-info/*
 %{python_sitelib}/pgactivity/*.py*
 %{python_sitelib}/pgactivity/__pycache__/*.pyc
 %{python_sitelib}/pgactivity/profiles/*.conf
@@ -106,6 +104,7 @@ find . -type f -exec sed -i 's/blessed/blessings/g' {} +
 - Update to 3.6.1 per changes described at:
   https://github.com/dalibo/pg_activity/releases/tag/v3.6.1
 - Add SLES 16 support
+- Switch to pyproject build
 
 * Fri Feb 21 2025 Devrim Gündüz <devrim@gunduz.org> - 3.6.0-42PGDG
 - Update to 3.6.0 per changes described at: