diff --git a/.gitignore b/.gitignore index 21eac4e..7b75d32 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /boom-1.1.tar.gz /boom-1.2.tar.gz /boom-1.3.tar.gz +/boom-1.4.tar.gz diff --git a/0001-etc-Remove-executable-permission-from-etc-default-bo.patch b/0001-etc-Remove-executable-permission-from-etc-default-bo.patch deleted file mode 100644 index d454da1..0000000 --- a/0001-etc-Remove-executable-permission-from-etc-default-bo.patch +++ /dev/null @@ -1,22 +0,0 @@ - etc/default/boom | 0 - tests/bootloader_configs/boom_off/etc/default/boom | 0 - tests/bootloader_configs/boom_on/etc/default/boom | 0 - tests/bootloader_configs/no_grub_d/etc/default/boom | 0 - 4 files changed, 0 insertions(+), 0 deletions(-) - mode change 100755 => 100644 etc/default/boom - mode change 100755 => 100644 tests/bootloader_configs/boom_off/etc/default/boom - mode change 100755 => 100644 tests/bootloader_configs/boom_on/etc/default/boom - mode change 100755 => 100644 tests/bootloader_configs/no_grub_d/etc/default/boom - -diff --git a/etc/default/boom b/etc/default/boom -old mode 100755 -new mode 100644 -diff --git a/tests/bootloader_configs/boom_off/etc/default/boom b/tests/bootloader_configs/boom_off/etc/default/boom -old mode 100755 -new mode 100644 -diff --git a/tests/bootloader_configs/boom_on/etc/default/boom b/tests/bootloader_configs/boom_on/etc/default/boom -old mode 100755 -new mode 100644 -diff --git a/tests/bootloader_configs/no_grub_d/etc/default/boom b/tests/bootloader_configs/no_grub_d/etc/default/boom -old mode 100755 -new mode 100644 diff --git a/boom-boot.spec b/boom-boot.spec index a3e7694..3be6abc 100644 --- a/boom-boot.spec +++ b/boom-boot.spec @@ -2,21 +2,22 @@ %global sphinx_docs 1 Name: boom-boot -Version: 1.3 -Release: 3%{?dist} +Version: 1.4 +Release: 1%{?dist} Summary: %{summary} License: GPLv2 URL: https://github.com/snapshotmanager/boom Source0: https://github.com/snapshotmanager/boom/archive/%{version}/boom-%{version}.tar.gz -Patch1: 0001-etc-Remove-executable-permission-from-etc-default-bo.patch -Patch2: 0002-man-Fix-line-starting-with.patch +Patch1: 0002-man-Fix-line-starting-with.patch BuildArch: noarch +BuildRequires: make BuildRequires: python3-setuptools BuildRequires: python3-devel %if 0%{?sphinx_docs} +BuildRequires: python3-dbus BuildRequires: python3-sphinx %endif BuildRequires: make @@ -31,6 +32,10 @@ Requires: %{__python3} Recommends: (lvm2 or brtfs-progs) Recommends: %{name}-conf = %{version}-%{release} +Obsoletes: boom-boot-grub2 <= 1.3 +# boom-grub2 was not an official name of subpackage in fedora, but was used upstream: +Obsoletes: boom-grub2 <= 1.3 + # There used to be a boom package in fedora, and there is boom packaged in # copr. How to tell which one is installed? We need python3-boom and no boom # only. @@ -39,10 +44,6 @@ Conflicts: boom %package conf Summary: %{summary} -%package grub2 -Summary: %{summary} -Supplements: (grub2 and boom-boot = %{version}-%{release}) - %description Boom is a boot manager for Linux systems using boot loaders that support the BootLoader Specification for boot entry configuration. @@ -71,21 +72,10 @@ include this support in both Red Hat Enterprise Linux 7 and Fedora). This package provides configuration files for boom. -%description grub2 -Boom is a boot manager for Linux systems using boot loaders that support -the BootLoader Specification for boot entry configuration. - -Boom requires a BLS compatible boot loader to function: either the -systemd-boot project, or Grub2 with the BLS patch (Red Hat Grub2 builds -include this support in both Red Hat Enterprise Linux 7 and Fedora). - -This package provides integration scripts for grub2 bootloader. - %prep %setup -n boom-%{version} # NOTE: Do not use backup extension - MANIFEST.in is picking them %patch1 -p1 -%patch2 -p1 %build %if 0%{?sphinx_docs} @@ -100,20 +90,14 @@ rm -r doc/_build %install %py3_install -# Install Grub2 integration scripts -mkdir -p ${RPM_BUILD_ROOT}/etc/grub.d -mkdir -p ${RPM_BUILD_ROOT}/etc/default -install -m 755 etc/grub.d/42_boom ${RPM_BUILD_ROOT}/etc/grub.d -install -m 644 etc/default/boom ${RPM_BUILD_ROOT}/etc/default - # Make configuration directories # mode 0700 - in line with /boot/grub2 directory: -install -d -m 700 ${RPM_BUILD_ROOT}/boot/boom/profiles +#install -d -m 700 ${RPM_BUILD_ROOT}/boot/boom/profiles install -d -m 700 ${RPM_BUILD_ROOT}/boot/boom/hosts install -d -m 700 ${RPM_BUILD_ROOT}/boot/loader/entries install -d -m 700 ${RPM_BUILD_ROOT}/boot/boom/cache install -m 644 examples/boom.conf ${RPM_BUILD_ROOT}/boot/boom -install -m 644 examples/profiles/*.profile ${RPM_BUILD_ROOT}/boot/boom/profiles +#install -m 644 examples/profiles/*.profile ${RPM_BUILD_ROOT}/boot/boom/profiles mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man8 mkdir -p ${RPM_BUILD_ROOT}/%{_mandir}/man5 @@ -146,26 +130,25 @@ rm doc/conf.py %doc README.md %dir /boot/boom %config(noreplace) /boot/boom/boom.conf -%dir /boot/boom/profiles -%config(noreplace) /boot/boom/profiles/* +#%%dir /boot/boom/profiles +#%%config(noreplace) /boot/boom/profiles/* %dir /boot/boom/hosts %dir /boot/boom/cache %dir /boot/loader/entries -%files grub2 -%license COPYING -%doc README.md -%{_sysconfdir}/grub.d/42_boom -%config(noreplace) %{_sysconfdir}/default/boom - %changelog -* Mon Aug 09 2021 Mohan Boddu - 1.3-3 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Mon May 23 2022 Marian Csontos 1.4-1 +- Update to release 1.4. -* Thu Apr 15 2021 Mohan Boddu - 1.3-2 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Wed Jan 19 2022 Fedora Release Engineering - 1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 1.3-2 +- Rebuilt for Python 3.10 * Fri Jan 29 2021 Marian Csontos 1.3-1 - Update to release 1.3. diff --git a/sources b/sources index e62edbd..cac59a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (boom-1.3.tar.gz) = b11ba8c81b2d70104181065620948f51b0999dbccff42b7af71e31a0c1ab3e3730dab739be7f08024f0df1eafabc4e33b747518e816b314a54d30769c5622b0a +SHA512 (boom-1.4.tar.gz) = f2f4ee658a8f1b670b0dd15c56a7f7c9eef047e2ca9aeaa7c54c619e68428c8225c3c115d2d12f0b055091752e8ee5c8be266ddb49ae4a036c6aa7cf32e03861