diff --git a/.boom-boot.metadata b/.boom-boot.metadata index 205ce0f..153d0c4 100644 --- a/.boom-boot.metadata +++ b/.boom-boot.metadata @@ -1 +1 @@ -d5e8fa98d5d7da7ff2287d7e71d8868b85579106 SOURCES/boom-1.6.3.tar.gz +e13b6eda000f86d9323e7573735923958736ec4b SOURCES/boom-boot-1.6.5.tar.gz diff --git a/.gitignore b/.gitignore index 2a90598..a118c12 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/boom-1.6.3.tar.gz +SOURCES/boom-boot-1.6.5.tar.gz diff --git a/SPECS/boom-boot.spec b/SPECS/boom-boot.spec index 3d79a48..f5e59be 100644 --- a/SPECS/boom-boot.spec +++ b/SPECS/boom-boot.spec @@ -2,30 +2,35 @@ %global sphinx_docs 1 Name: boom-boot -Version: 1.6.3 +Version: 1.6.5 Release: 3%{?dist} Summary: %{summary} License: GPL-2.0-only -URL: https://github.com/snapshotmanager/boom -Source0: %{url}/archive/%{version}/boom-%{version}.tar.gz +URL: https://github.com/snapshotmanager/boom-boot +Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: make BuildRequires: python3-setuptools BuildRequires: python3-devel +BuildRequires: python3-pip +BuildRequires: python3-wheel %if 0%{?sphinx_docs} 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 +%if 0%{?rhel} == 9 +Requires: systemd >= 252-18 +%else Requires: systemd >= 254 +%endif Obsoletes: boom-boot-grub2 <= 1.3 # boom-grub2 was not an official name of subpackage in fedora, but was used upstream: @@ -75,7 +80,7 @@ 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} @@ -85,10 +90,18 @@ 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: @@ -120,7 +133,11 @@ rm doc/conf.py %license COPYING %doc README.md %{python3_sitelib}/boom/* -%{python3_sitelib}/boom-*.egg-info/ +%if 0%{?centos} || 0%{?rhel} +%{python3_sitelib}/boom*.egg-info/ +%else +%{python3_sitelib}/boom*.dist-info/ +%endif %doc doc %doc examples %doc tests @@ -137,6 +154,10 @@ rm doc/conf.py %changelog +* Fri Dec 13 2024 Bryn M. Reeves - 1.6.5-1 +- Update to release 1.6.5 +- Resolves: RHEL-59511 + * Tue Oct 29 2024 Troy Dawson - 1.6.3-3 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018