From 15e4599850d58fffb195b35bc8ea784957c6c9bc Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Mon, 12 May 2025 19:11:39 +0100
Subject: [PATCH] Update to upstream 0.4.3

Resolves: RHEL-80365
Resolves: RHEL-76129
---
 .gitignore |   1 +
 snapm.spec | 106 ++++++++++++++++-------------------------------------
 sources    |   2 +-
 3 files changed, 34 insertions(+), 75 deletions(-)

diff --git a/.gitignore b/.gitignore
index aacd5b2..4295503 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /snapm-0.4.0.tar.gz
+/snapm-0.4.3.tar.gz
diff --git a/snapm.spec b/snapm.spec
index 080ad0d..0607150 100644
--- a/snapm.spec
+++ b/snapm.spec
@@ -1,53 +1,32 @@
 %global summary A set of tools for managing snapshots
-%global sphinx_docs 1
 
 Name:		snapm
-Version:	0.4.0
-Release:	2%{?dist}
+Version:	0.4.3
+Release:	1%{?dist}
 Summary:	%{summary}
 
-License:	GPL-2.0-only AND Apache-2.0
-URL:		https://github.com/snapshotmanager/snapm
+License:	Apache-2.0
+URL:		https://github.com/snapshotmanager/%{name}
 Source0:	%{url}/archive/v%{version}/%{name}-%{version}.tar.gz
-Patch1:		0001-tests-temporarily-exclude-CentOS-from-test_boot.is_r.patch
 
 BuildArch:	noarch
 
-BuildRequires:	make
-BuildRequires:	python3-setuptools
-BuildRequires:	python3-devel
-BuildRequires:	python3-pip
-BuildRequires:	python3-wheel
-BuildRequires:	python3-boom
-BuildRequires:	python3-dbus-client-gen
-BuildRequires:	python3-dbus-python-client-gen
-BuildRequires:	python3-justbytes
-BuildRequires:	python3-packaging
-BuildRequires:	python3-dateutil
-BuildRequires:	python3-wcwidth
-BuildRequires:	python3-psutil
-BuildRequires:	python3-pytest
-BuildRequires:	lvm2
-BuildRequires:	stratisd
-BuildRequires:	stratis-cli
-%if 0%{?sphinx_docs}
-BuildRequires:	python3-sphinx
 BuildRequires:	boom-boot
-%endif
+BuildRequires:	lvm2
+BuildRequires:	make
+BuildRequires:	stratis-cli
+BuildRequires:	stratisd
+BuildRequires:	python3-devel
+BuildRequires:	python3-sphinx
 
 Requires: python3-snapm = %{version}-%{release}
 Recommends: boom-boot
 
 %package -n python3-snapm
 Summary: %{summary}
-%{?python_provide:%python_provide python3-snapm}
-Requires: %{__python3}
-Requires: python3-boom >= 1.6.4
 
-%if 0%{?sphinx_docs}
 %package -n python3-snapm-doc
 Summary: %{summary}
-%endif
 
 %description
 Snapshot manager (snapm) is a tool for managing sets of snapshots on Linux
@@ -61,83 +40,62 @@ the same time, representing the system state at the time the set was created.
 
 This package provides the python3 snapm module.
 
-%if 0%{?sphinx_docs}
 %description -n python3-snapm-doc
 Snapshot manager (snapm) is a tool for managing sets of snapshots on Linux
 systems.  The snapm tool allows snapshots of multiple volumes to be captured at
 the same time, representing the system state at the time the set was created.
 
 This package provides the python3 snapm module documentation in HTML format.
-%endif
 
 %prep
-%autosetup -p1 -n snapm-%{version}
+%autosetup -p1 -n %{name}-%{version}
+
+%generate_buildrequires
+%pyproject_buildrequires
 
 %build
-%if 0%{?sphinx_docs}
-make %{?_smp_mflags} -C doc html
+%pyproject_wheel
+
+%{make_build} -C doc html
 rm doc/_build/html/.buildinfo
 mv doc/_build/html doc/html
-rm -rf doc/html/_sources
-rm -rf doc/_build
-rm -f doc/*.rst
-%endif
-
-%if 0%{?centos} || 0%{?rhel}
-%py3_build
-%else
-%pyproject_wheel
-%endif
+rm -rf doc/html/_sources doc/_build
+rm -f doc/*.rst doc/Makefile doc/conf.py
 
 %install
-%if 0%{?centos} || 0%{?rhel}
-%py3_install
-%else
 %pyproject_install
-%endif
 
-mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man8
-install -m 644 man/man8/snapm.8 ${RPM_BUILD_ROOT}/%{_mandir}/man8
-
-rm doc/Makefile
-rm doc/conf.py
+mkdir -p %{buildroot}/%{_mandir}/man8
+%{__install} -p -m 644 man/man8/snapm.8 %{buildroot}/%{_mandir}/man8
 
 %check
-pytest-3 --log-level=debug -v
+%pytest --log-level=debug -v tests/
 
 %files
-# Main license for snapm (GPLv2)
-%license COPYING
-# License for snapm.manager.plugins.stratislib (Apache 2.0)
-%license COPYING.stratislib
+# Main license for snapm (Apache-2.0)
+%license LICENSE
 %doc README.md
 %{_bindir}/snapm
 %doc %{_mandir}/man*/snapm.*
 
 %files -n python3-snapm
-# Main license for snapm (GPLv2)
-%license COPYING
-# License for snapm.manager.plugins.stratislib (Apache 2.0)
-%license COPYING.stratislib
+# license for snapm (Apache-2.0)
+%license LICENSE
 %doc README.md
 %{python3_sitelib}/%{name}/
-%if 0%{?centos} || 0%{?rhel}
-%{python3_sitelib}/%{name}-*.egg-info/
-%else
 %{python3_sitelib}/%{name}*.dist-info/
-%endif
 
-%if 0%{?sphinx_docs}
 %files -n python3-snapm-doc
-# Main license for snapm (GPLv2)
-%license COPYING
-# License for snapm.manager.plugins.stratislib (Apache 2.0)
-%license COPYING.stratislib
+# license for snapm (Apache-2.0)
+%license LICENSE
 %doc README.md
 %doc doc
-%endif
 
 %changelog
+* Mon May 12 2025 Bryn M. Reeves <bmr@redhat.com> - 0.4.3-1
+- Update to upstream 0.4.3
+  Resolves: RHEL-80365
+  Resolves: RHEL-76129
 * Thu Jan 09 2025 Bryn M. Reeves <bmr@redhat.com> - 0.4.0-2
 - Bump release and rebuild
   Resolves: RHEL-59006
diff --git a/sources b/sources
index 45c1aca..eebae8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (snapm-0.4.0.tar.gz) = d4829bef312212e0b122c241235cce6520dc1c37e11dbe32d1882485a2d81e94aa396d0957c13fee848e472ab3efcad18b262c5bfbb9a7fd08f74497d34f97ba
+SHA512 (snapm-0.4.3.tar.gz) = 2a481781f1275fbbb6a5052fbc69379aa85b79f05b860e15aef7826ce75627cbfa6717a93c5a9b538f30ba01900fd70e856b8d5d7a417f010af6b4ec58fb377c