From 0615f554fb7c277294821f18a20c7e0706cd1816383326c088bade7e7969f759 Mon Sep 17 00:00:00 2001
From: Wolfgang Frisch <wolfgang.frisch@suse.com>
Date: Tue, 6 Jun 2023 07:57:14 +0000
Subject: [PATCH] Accepting request 1090960 from home:lrupp:branches:security

- use nagios-rpm-macros to define the libexecdir for SUSE distributions
  correctly (defaut here is /usr/lib/nagios/plugins)
- move conditional for %%pre scripts, to avoid any dependency or other
  stuff getting in the way on old distributions

OBS-URL: https://build.opensuse.org/request/show/1090960
OBS-URL: https://build.opensuse.org/package/show/security/fail2ban?expand=0&rev=116
---
 fail2ban.changes |  8 ++++++++
 fail2ban.spec    | 14 +++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/fail2ban.changes b/fail2ban.changes
index 0111dd4..f1e5d54 100644
--- a/fail2ban.changes
+++ b/fail2ban.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jun  5 16:36:47 UTC 2023 - Lars Vogdt <lars@linux-schulserver.de>
+
+- use nagios-rpm-macros to define the libexecdir for SUSE distributions
+  correctly (defaut here is /usr/lib/nagios/plugins)
+- move conditional for %%pre scripts, to avoid any dependency or other 
+  stuff getting in the way on old distributions
+
 -------------------------------------------------------------------
 Sun Dec  4 21:07:21 UTC 2022 - Dirk Müller <dmueller@suse.com>
 
diff --git a/fail2ban.spec b/fail2ban.spec
index dfd9172..dac3dd1 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fail2ban
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -103,9 +103,13 @@ reason, i.e. SFW will always run first because it does a table flush.
 %endif
 
 %package -n monitoring-plugins-%{name}
-%define         nagios_plugindir %{_libexecdir}/nagios/plugins
 Summary:        Check fail2ban server and how many IPs are currently banned
 Group:          System/Monitoring
+%if 0%{?suse_version}
+BuildRequires:  nagios-rpm-macros
+%else
+%define         nagios_plugindir %{_libexecdir}/nagios/plugins
+%endif
 Provides:       nagios-plugins-%{name} = %{version}
 Obsoletes:      nagios-plugins-%{name} < %{version}
 
@@ -231,8 +235,8 @@ export LANG=en_US.UTF-8
 ./fail2ban-testcases-all --no-network || true
 %endif
 
-%pre
 %if 0%{?suse_version} >= 1230
+%pre
 %service_add_pre %{name}.service
 %endif
 
@@ -333,7 +337,11 @@ export LANG=en_US.UTF-8
 %files -n monitoring-plugins-%{name}
 %license COPYING
 %doc files/nagios/README
+%if 0%{?suse_version}
+%dir %{nagios_libdir}
+%else
 %dir %{_libexecdir}/nagios
+%endif
 %dir %{nagios_plugindir}
 %{nagios_plugindir}/check_%{name}