From fe795d997cbc64066674a799fd42cb61ba89e905b417fd5da18dc0cf47bef56e Mon Sep 17 00:00:00 2001
From: Johannes Weberhofer <jweberhofer@weberhofer.at>
Date: Thu, 23 Nov 2017 15:46:03 +0000
Subject: [PATCH] Accepting request 544725 from
 home:RBrownSUSE:branches:security

Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

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

diff --git a/fail2ban.changes b/fail2ban.changes
index ff6ef82..95dc1f7 100644
--- a/fail2ban.changes
+++ b/fail2ban.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:44:10 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Sat Oct 21 04:43:44 UTC 2017 - jweberhofer@weberhofer.at
 
diff --git a/fail2ban.spec b/fail2ban.spec
index 3c47af3..5325d99 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 %{!?tmpfiles_create:%global tmpfiles_create systemd-tmpfiles --create}
 Name:           fail2ban
 Version:        0.10.1
@@ -188,8 +193,8 @@ echo "# Do all your modifications to the jail's configuration in jail.local!" >
 
 install -d -m 0755 %{buildroot}%{_localstatedir}/lib/%{name}/
 
-install -d -m 755 %{buildroot}%{_localstatedir}/adm/fillup-templates
-install -p -m 644 %{SOURCE2} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+install -d -m 755 %{buildroot}%{_fillupdir}
+install -p -m 644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.%{name}
 
 install -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
 install -p -m 644 %{SOURCE3}  %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
@@ -298,7 +303,7 @@ export LANG=en_US.UTF-8
 %{python_sitelib}/%{name}
 %exclude %{python_sitelib}/%{name}/tests
 %{python_sitelib}/%{name}-*
-%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 %doc README.md TODO ChangeLog COPYING doc/*.txt