Accepting request 544687 from home:RBrownSUSE:branches:Base:System

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

OBS-URL: https://build.opensuse.org/request/show/544687
OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=80

man.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:40:41 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Tue Nov 21 07:45:36 UTC 2017 - werner@suse.de
 

man.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
+
 %bcond_with wrapman
 
 Name:           man
@@ -230,9 +235,9 @@ fi
     mkdir -p %{buildroot}%{_datadir}/groff/site-tmac
     install -m 0644 groff/tmac.andb     %{buildroot}%{_datadir}/groff/site-tmac/
     install -m 0644 groff/tmac.andocdb  %{buildroot}%{_datadir}/groff/site-tmac/
-    mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+    mkdir -p %{buildroot}%{_fillupdir}
     mkdir -p %{buildroot}/etc/cron.daily
-    install -m 0644 %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates
+    install -m 0644 %{SOURCE1} %{buildroot}%{_fillupdir}
     install -m 0744 %{SOURCE2} %{buildroot}/etc/cron.daily/suse-do_mandb
     install -m 0744 %{SOURCE3} %{buildroot}/etc/cron.daily/suse-clean_catman
 %find_lang man-db --all-name --with-man
@@ -286,7 +291,7 @@ mandb --quiet --create
 %doc %{_mandir}/man5/*.5.gz
 %doc %{_mandir}/man8/*.8.gz
 %dir %{_mandir}/id
-%{_localstatedir}/adm/fillup-templates/sysconfig.cron-man
+%{_fillupdir}/sysconfig.cron-man
 %defattr(-,man,man)
 %ghost %{_localstatedir}/cache/man/*