From 55b789e52d438fbcdf6e20f062855afe577b0e9bf82072376fa9fd5f08542bb1 Mon Sep 17 00:00:00 2001 From: Lars Vogdt Date: Fri, 29 Oct 2021 13:54:52 +0000 Subject: [PATCH] Accepting request 925545 from home:adaugherity:branches:server:monitoring - unbreak build on SLES 12 & RHEL 7 (_rpmmacrodir not set) OBS-URL: https://build.opensuse.org/request/show/925545 OBS-URL: https://build.opensuse.org/package/show/server:monitoring/nagios-rpm-macros?expand=0&rev=49 --- nagios-rpm-macros.changes | 5 +++++ nagios-rpm-macros.spec | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/nagios-rpm-macros.changes b/nagios-rpm-macros.changes index 762d839..144fd4f 100644 --- a/nagios-rpm-macros.changes +++ b/nagios-rpm-macros.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 15 18:22:54 UTC 2021 - Andrew Daugherity + +- unbreak build on SLES 12 & RHEL 7 (_rpmmacrodir not set) + ------------------------------------------------------------------- Fri Jun 11 12:02:11 UTC 2021 - Dominique Leuenberger diff --git a/nagios-rpm-macros.spec b/nagios-rpm-macros.spec index 05cb0a6..4066505 100644 --- a/nagios-rpm-macros.spec +++ b/nagios-rpm-macros.spec @@ -33,6 +33,11 @@ Source6: macros.icinga Source7: macros.icinga2 BuildArch: noarch +# _rpmmacrodir doesn't exist on SLES 12 or RHEL 7 +%if %{undefined _rpmmacrodir} +%define _rpmmacrodir %{_rpmconfigdir}/macros.d +%endif + %description This package provides rpm macros for building packages for Nagios, check_mk and/or Icinga.