From e95f4fc1e006d5f1107542eedc55b2aa2f90f5eb Mon Sep 17 00:00:00 2001 From: Rene Trippen Date: Fri, 24 Jun 2022 17:20:25 +0200 Subject: [PATCH 1/2] spec: add rhel8 support --- contrib/monitoring-check-systemd-service.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/monitoring-check-systemd-service.spec b/contrib/monitoring-check-systemd-service.spec index 911e768..591efdf 100644 --- a/contrib/monitoring-check-systemd-service.spec +++ b/contrib/monitoring-check-systemd-service.spec @@ -1,6 +1,6 @@ Name: monitoring-check-systemd-service Version: %{version} -Release: %{release} +Release: %{release}%{?dist} Epoch: 1 Summary: Nagios/Icinga check for systemd services AutoReqProv: no @@ -8,9 +8,16 @@ BuildArch: noarch Source0: https://github.com/joernott/monitoring-check-systemd-service/archive/v%{version}.tar.gz#/monitoring-check-systemd-service-%{version}.tar.gz License: BSD URL: https://github.com/joernott/monitoring-check-systemd-service +%if 0%{?rhel} == 8 +Requires: python36 +Requires: python3-gobject +Requires: python3-nagiosplugin +%else Requires: rh-python36 Requires: python36-gobject Requires: python3-nagiosplugin +%endif + %description This script is intended for icinga/nagios/icinga2 to check the state of a From 20a8b7669adc67822d3a78841649838bcbea850c Mon Sep 17 00:00:00 2001 From: Rene Trippen Date: Mon, 27 Jun 2022 15:45:24 +0200 Subject: [PATCH 2/2] spec: use rhel macro instead of dist macro - dist macro produces output like .el7_9 in rhel7 --- contrib/monitoring-check-systemd-service.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/monitoring-check-systemd-service.spec b/contrib/monitoring-check-systemd-service.spec index 591efdf..c77f75a 100644 --- a/contrib/monitoring-check-systemd-service.spec +++ b/contrib/monitoring-check-systemd-service.spec @@ -1,6 +1,6 @@ Name: monitoring-check-systemd-service Version: %{version} -Release: %{release}%{?dist} +Release: %{release}.el%{?rhel} Epoch: 1 Summary: Nagios/Icinga check for systemd services AutoReqProv: no