[packages/crmsh] - up to 5.0.0

[baggins]

commit a5f43a35656bc4686e7b0bfffeccb4241c8b9cdb
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Sep 20 01:28:39 2025 +0200

    - up to 5.0.0

 crmsh.spec        | 43 ++++++++++++++++++++++---------------------
 no-venv.patch     | 11 +++++++++++
 pip-install.patch | 11 +++++++++++
 3 files changed, 44 insertions(+), 21 deletions(-)
---
diff --git a/crmsh.spec b/crmsh.spec
index f430dc1..738e6fc 100644
--- a/crmsh.spec
+++ b/crmsh.spec
@@ -5,21 +5,24 @@
 Summary:	Pacemaker command line interface for management and configuration
 Summary(pl.UTF-8):	Interfejs linii poleceń do zarządzania i konfiguracji Pacemakera
 Name:		crmsh
-Version:	3.0.0
-Release:	2
+Version:	5.0.0
+Release:	1
 License:	GPL v2+
 Group:		Applications/System
 #Source0Download: https://github.com/ClusterLabs/crmsh/releases
-Source0:	https://github.com/ClusterLabs/crmsh/archive/%{version}/crmsh-%{version}.tar.gz
-# Source0-md5:	ff41cc2f4abf4498ea55fe033eb854f3
+Source0:	https://github.com/ClusterLabs/crmsh/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	d38e3073d35d56c3aff15efa6680a7ee
 Patch0:		%{name}-awk.patch
+Patch1:		no-venv.patch
+Patch2:		pip-install.patch
 URL:		http://crmsh.github.io/
 BuildRequires:	asciidoc
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	docbook-dtd45-xml
-BuildRequires:	python >= 1:2.6
-BuildRequires:	python-modules >= 1:2.6
+BuildRequires:	python3
+BuildRequires:	python3-modules
+BuildRequires:	python3-setuptools
 BuildRequires:	rpm-pythonprov
 BuildRequires:	sed >= 4.0
 Requires:	cluster-glue
@@ -40,8 +43,10 @@ Zawiera polecenie "crm", które było częścią Pacemakera < 1.1.8.
 %prep
 %setup -q
 %patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
 
-%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python}\1,' -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python3}\1,' -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python3}\1,' \
       utils/crm_clean.py \
       utils/crm_pkg.py \
       utils/crm_rpmcheck.py \
@@ -54,25 +59,19 @@ Zawiera polecenie "crm", które było częścią Pacemakera < 1.1.8.
 %{__autoconf}
 %{__automake}
 %configure \
-	PYTHON=%{__python}
-%{__make}
+	PYTHON=%{__python3}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-# can we py_postclean?
-
 # packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 # tests
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/%{name}/tests
-# reduntant
-%{__rm} -r $RPM_BUILD_ROOT%{py_sitescriptdir}/crmsh/install_files.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,11 +79,13 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README.md TODO doc/*.html
-%dir /etc/crm
-%config(noreplace) %verify(not md5 mtime size) /etc/crm/crm.conf
+%dir %{_sysconfdir}/crm
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/crm/crm.conf
+%{_sysconfdir}/crm/profiles.yml
 %attr(755,root,root) %{_bindir}/crm
-%{py_sitedir}/crmsh
-%{py_sitedir}/crmsh-%{version}-py*.egg-info
+%{py3_sitescriptdir}/crmsh
+%{py3_sitescriptdir}/crmsh-%{version}.dist-info
 %{_datadir}/%{name}
 %{_mandir}/man8/crm.8*
-%{_mandir}/man8/crmsh_hb_report.8*
+%{_mandir}/man8/crmsh_crm_report.8*
+%{_mandir}/man8/profiles.8*
diff --git a/no-venv.patch b/no-venv.patch
new file mode 100644
index 0000000..c3926f7
--- /dev/null
+++ b/no-venv.patch
@@ -0,0 +1,11 @@
+--- crmsh-5.0.0/Makefile.am~	2025-08-15 04:59:27.000000000 +0200
++++ crmsh-5.0.0/Makefile.am	2025-09-20 01:14:11.183327266 +0200
+@@ -66,7 +66,7 @@
+ 
+ # Build Python wheel
+ $(builddir)/dist/crmsh-$(VERSION)-py3-none-any.whl $(builddir)/build:
+-	cd $(srcdir); python3 -m build --outdir $(shell readlink -f $(builddir))/dist --wheel --sdist --verbose
++	cd $(srcdir); python3 -m build --outdir $(shell readlink -f $(builddir))/dist --wheel --sdist --verbose --no-isolation
+ 
+ all-local: $(builddir)/dist/crmsh-$(VERSION)-py3-none-any.whl $(builddir)/build
+ 
diff --git a/pip-install.patch b/pip-install.patch
new file mode 100644
index 0000000..38afdfb
--- /dev/null
+++ b/pip-install.patch
@@ -0,0 +1,11 @@
+--- crmsh-5.0.0/Makefile.am~	2025-09-20 01:16:58.000000000 +0200
++++ crmsh-5.0.0/Makefile.am	2025-09-20 01:21:12.626660602 +0200
+@@ -75,7 +75,7 @@
+ # Python module installation
+ install-exec-local:
+ 	$(INSTALL) -d -m 770 $(DESTDIR)${localstatedir}/log/crmsh
+-	python3 -m pip install --prefix=$(prefix) $(shell readlink -f $(builddir))/dist/*.whl
++	python3 -m pip install --prefix=$(DESTDIR)$(prefix) $(shell readlink -f $(builddir))/dist/*.whl
+ 	$(INSTALL) -d -m 770 $(DESTDIR)$(CRM_CACHE_DIR)
+ 
+ uninstall-local:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crmsh.git/commitdiff/a5f43a35656bc4686e7b0bfffeccb4241c8b9cdb