From 9ec64c1b6a3cd1495d62f5a90bc38900cc4e09f5aa35fb594e1da52e2ef0b085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Str=C3=B6der?= <michael@stroeder.com>
Date: Thu, 23 Nov 2017 14:51:34 +0000
Subject: [PATCH] Accepting request 544664 from
 home:RBrownSUSE:branches:network

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

OBS-URL: https://build.opensuse.org/request/show/544664
OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=202
---
 krb5-mini.changes |  6 ++++++
 krb5-mini.spec    | 13 +++++++++----
 krb5.changes      |  6 ++++++
 krb5.spec         | 13 +++++++++----
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/krb5-mini.changes b/krb5-mini.changes
index fbfff09..0bbbdb1 100644
--- a/krb5-mini.changes
+++ b/krb5-mini.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:38:33 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Mon Oct  2 22:53:28 UTC 2017 - jengelh@inai.de
 
diff --git a/krb5-mini.spec b/krb5-mini.spec
index 8b43746..e58f5bd 100644
--- a/krb5-mini.spec
+++ b/krb5-mini.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
+
 %define srcRoot krb5-1.15.2
 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
 %define krb5docdir  %{_defaultdocdir}/krb5
@@ -199,9 +204,9 @@ install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb
 install -m 755 %{vendorFiles}/kpropd.init  %{buildroot}%{_sysconfdir}/init.d/kpropd
 %endif
 # install sysconfig templates
-mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates
-install -m 644 %{vendorFiles}/sysconfig.kadmind $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/
-install -m 644 %{vendorFiles}/sysconfig.krb5kdc $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/
+mkdir -p $RPM_BUILD_ROOT/%{_fillupdir}
+install -m 644 %{vendorFiles}/sysconfig.kadmind $RPM_BUILD_ROOT/%{_fillupdir}/
+install -m 644 %{vendorFiles}/sysconfig.krb5kdc $RPM_BUILD_ROOT/%{_fillupdir}/
 # install logrotate files
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 644 %{vendorFiles}/krb5-server.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5-server
@@ -324,7 +329,7 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
-%{_var}/adm/fillup-templates/sysconfig.*
+%{_fillupdir}/sysconfig.*
 %{_unitdir}/kadmind.service
 %{_unitdir}/krb5kdc.service
 %{_unitdir}/kpropd.service
diff --git a/krb5.changes b/krb5.changes
index d9adcaf..9e10091 100644
--- a/krb5.changes
+++ b/krb5.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:38:38 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Mon Nov  6 10:23:00 UTC 2017 - hguo@suse.com
 
diff --git a/krb5.spec b/krb5.spec
index 7447732..b60024f 100644
--- a/krb5.spec
+++ b/krb5.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
+
 Name:           krb5
 Url:            https://web.mit.edu/kerberos/www/
 BuildRequires:  autoconf
@@ -266,9 +271,9 @@ install -m 755 %{vendorFiles}/krb5kdc.init %{buildroot}%{_sysconfdir}/init.d/krb
 install -m 755 %{vendorFiles}/kpropd.init  %{buildroot}%{_sysconfdir}/init.d/kpropd
 %endif
 # install sysconfig templates
-mkdir -p $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates
-install -m 644 %{vendorFiles}/sysconfig.kadmind $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/
-install -m 644 %{vendorFiles}/sysconfig.krb5kdc $RPM_BUILD_ROOT/%{_var}/adm/fillup-templates/
+mkdir -p $RPM_BUILD_ROOT/%{_fillupdir}
+install -m 644 %{vendorFiles}/sysconfig.kadmind $RPM_BUILD_ROOT/%{_fillupdir}/
+install -m 644 %{vendorFiles}/sysconfig.krb5kdc $RPM_BUILD_ROOT/%{_fillupdir}/
 # install logrotate files
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 644 %{vendorFiles}/krb5-server.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/krb5-server
@@ -419,7 +424,7 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.acl
 %attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kadm5.dict
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/k*
-%{_var}/adm/fillup-templates/sysconfig.*
+%{_fillupdir}/sysconfig.*
 /usr/sbin/rc*
 /usr/lib/mit/sbin/kadmin.local
 /usr/lib/mit/sbin/kadmind