From 9a916912748c64d8661ded84f37a1ed4e02da761 Mon Sep 17 00:00:00 2001 From: Marian Csontos Date: Thu, 9 May 2019 12:36:40 +0200 Subject: [PATCH] Fix packaging issues - install /boot/boom/hosts directory, - fix subcomponents' dependencies. --- boom-boot.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/boom-boot.spec b/boom-boot.spec index 73f1f10..8a89d13 100644 --- a/boom-boot.spec +++ b/boom-boot.spec @@ -6,7 +6,7 @@ Name: boom-boot Version: 1.0 -Release: 0.1.20190329git%{shortcommit}%{?dist} +Release: 0.2.20190329git%{shortcommit}%{?dist} Summary: %{summary} License: GPLv2 @@ -21,15 +21,15 @@ BuildRequires: python3-devel BuildRequires: python3-sphinx %endif -Requires: python3-boom -Requires: %{name}-conf +Requires: python3-boom = %{version}-%{release} +Requires: %{name}-conf = %{version}-%{release} %package -n python3-boom Summary: %{summary} %{?python_provide:%python_provide python3-boom} Requires: python3 Recommends: (lvm2 or brtfs-progs) -Recommends: %{name}-conf +Recommends: %{name}-conf = %{version}-%{release} # 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 @@ -41,7 +41,7 @@ Summary: %{summary} %package grub2 Summary: %{summary} -Supplements: (grub2 and boom-boot) +Supplements: (grub2 and boom-boot = %{version}-%{release}) %description Boom is a boot manager for Linux systems using boot loaders that support @@ -107,6 +107,7 @@ 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/hosts install -d -m 700 ${RPM_BUILD_ROOT}/boot/loader/entries install -m 644 examples/boom.conf ${RPM_BUILD_ROOT}/boot/boom @@ -153,6 +154,9 @@ rm doc/conf.py %changelog +* Thu May 09 2019 Marian Csontos 1.0-0.2.20190329git6ff3e08 +- Fix packaging issues. + * Thu May 09 2019 Marian Csontos 1.0-0.1.20190329git6ff3e08 - Pre-release of new version.