From 9221260618b951e647507120756ea733b1ed294a Mon Sep 17 00:00:00 2001 From: Carl George Date: Jun 14 2022 23:05:39 +0000 Subject: Change drbd-pacemaker to recommend instead of require pacemaker on EPEL8/EPEL9 pacemaker is in the RHEL highavailability channel in EL8 and EL9. EPEL packages dependencies must be in the "target base" (baseos, appstream, crb). Weak dependencies are allowed on packages from other channels, so use a recommends instead of a requires on EPEL8 and EPEL9. https://docs.fedoraproject.org/en-US/epel/epel-packaging/#package_dependencies Resolves: rhbz#2086146 --- diff --git a/drbd.spec b/drbd.spec index 9119d80..927c8b9 100644 --- a/drbd.spec +++ b/drbd.spec @@ -1,7 +1,7 @@ Name: drbd Summary: DRBD user-land tools and scripts Version: 9.21.1 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://pkg.linbit.com/downloads/%{name}/utils/%{name}-utils-%{version}.tar.gz Patch0: drbd-utils-9.12.2-disable_xsltproc_network_read.patch Patch1: drbd-utils-9.15.0-make_configure-workaround.patch @@ -160,7 +160,17 @@ DRBD devices in /dev/drbd/by-res and /dev/drbd/by-disk. %package pacemaker Summary: Pacemaker resource agent for DRBD Requires: %{name}-utils = %{version}-%{release} +# pacemaker is in the RHEL highavailability channel in EL8 and EL9. EPEL +# packages dependencies must be in the "target base" (baseos, appstream, crb). +# Weak dependencies are allowed on packages from other channels, so use a +# recommends instead of a requires on EPEL8 and EPEL9. +# https://docs.fedoraproject.org/en-US/epel/epel-packaging/#package_dependencies +# https://bugzilla.redhat.com/show_bug.cgi?id=2086146 +%if %{defined rhel} && 0%{?rhel} >= 8 +Recommends: pacemaker +%else Requires: pacemaker +%endif License: GPLv2 %description pacemaker @@ -215,6 +225,9 @@ management utility. %systemd_preun drbd.service %changelog +* Tue Jun 14 2022 Carl George - 9.21.1-2 +- Change drbd-pacemaker to recommend instead of require pacemaker on EPEL8/EPEL9 rhbz#2086146 + * Sun Jun 5 2022 Peter Hanecak - 9.21.1-1 - Upstream release of 9.21.1