From 6360fc029490fb90dc76e0f1f3e4962e679fdcfb Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Fri, 13 Dec 2024 17:45:23 +0000
Subject: [PATCH] Update boom-boot to upstream release 1.6.5

Resolves: RHEL-59512

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
 .gitignore     |  1 +
 boom-boot.spec | 32 ++++++++++++++++++++------------
 sources        |  2 +-
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index b957e92..b712afa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /boom-1.5.1.tar.gz
 /boom-1.6.0.tar.gz
 /boom-1.6.1.tar.gz
+/boom-boot-1.6.5.tar.gz
diff --git a/boom-boot.spec b/boom-boot.spec
index bb9ba35..c89e24a 100644
--- a/boom-boot.spec
+++ b/boom-boot.spec
@@ -2,13 +2,13 @@
 %global sphinx_docs 1
 
 Name:		boom-boot
-Version:	1.6.1
-Release:	2%{?dist}
+Version:	1.6.5
+Release:	1%{?dist}
 Summary:	%{summary}
 
 License:	GPL-2.0-only
-URL:		https://github.com/snapshotmanager/boom
-Source0:	https://github.com/snapshotmanager/boom/archive/%{version}/boom-%{version}.tar.gz
+URL:		https://github.com/snapshotmanager/boom-boot
+Source0:	%{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
 BuildArch:	noarch
 
@@ -20,10 +20,10 @@ BuildRequires:	python3-dbus
 BuildRequires:	python3-sphinx
 %endif
 BuildRequires: make
-BuildRequires: systemd-rpm-macros
 
 Requires: python3-boom = %{version}-%{release}
 Requires: %{name}-conf = %{version}-%{release}
+Requires: python3-dbus
 Requires: systemd >= 252-18
 
 Obsoletes: boom-boot-grub2 <= 1.3
@@ -74,20 +74,28 @@ include this support in both Red Hat Enterprise Linux 7 and Fedora).
 This package provides configuration files for boom.
 
 %prep
-%autosetup -p1 -n boom-%{version}
+%autosetup -p1 -n %{name}-%{version}
 
 %build
 %if 0%{?sphinx_docs}
-make -C doc html
+make %{?_smp_mflags} -C doc html
 rm doc/_build/html/.buildinfo
 mv doc/_build/html doc/html
 rm -r doc/_build
 %endif
 
+%if 0%{?centos} || 0%{?rhel}
 %py3_build
+%else
+%pyproject_wheel
+%endif
 
 %install
+%if 0%{?centos} || 0%{?rhel}
 %py3_install
+%else
+%pyproject_install
+%endif
 
 # Make configuration directories
 # mode 0700 - in line with /boot/grub2 directory:
@@ -102,9 +110,6 @@ mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man5
 install -m 644 man/man8/boom.8 ${RPM_BUILD_ROOT}/%{_mandir}/man8
 install -m 644 man/man5/boom.5 ${RPM_BUILD_ROOT}/%{_mandir}/man5
 
-mkdir -p ${RPM_BUILD_ROOT}/%{_systemdgeneratordir}
-install -m 755 systemd/snapshot-remount-fs ${RPM_BUILD_ROOT}/%{_systemdgeneratordir}
-
 rm doc/Makefile
 rm doc/conf.py
 
@@ -116,13 +121,12 @@ rm doc/conf.py
 %license COPYING
 %doc README.md
 %{_bindir}/boom
-%{_systemdgeneratordir}/snapshot-remount-fs
 %doc %{_mandir}/man*/boom.*
 
 %files -n python3-boom
 %license COPYING
 %doc README.md
-%{python3_sitelib}/*
+%{python3_sitelib}/boom/
 %doc doc
 %doc examples
 %doc tests
@@ -139,6 +143,10 @@ rm doc/conf.py
 
 
 %changelog
+* Fri Dec 13 2024 Bryn M. Reeves <bmr@redhat.com> - 1.6.5-1
+- Update to release 1.6.5.
+- Resolves: RHEL-59512
+
 * Tue May 21 2024 Bryan Gurney <bgurney@redhat.com> - 1.6.1-2
 - Add issues resolved by release 1.6.1
 - Resolves: RHEL-36001
diff --git a/sources b/sources
index 0704ee7..7832ba0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (boom-1.6.1.tar.gz) = 33a66e9a4ed8b9a4ff727a542725944cd52c58485ebd9e9c5df9b0557a73c575f4427de07134b72cd248a41a41f1a52d99fc949481170977b0d28ad756e1d793
+SHA512 (boom-boot-1.6.5.tar.gz) = a3960b2c70707ff03354b831a859813a29376cc1f0e2db5132797ed29944888df9932b38092081e7eca7d40d7c9dd98817720261a6005ff7c20e733d1f01ca82