Accepting request 544719 from home:RBrownSUSE:branches:Apache

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

OBS-URL: https://build.opensuse.org/request/show/544719
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=534

apache2.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 apache_mmn	%(test -s %{SOURCE0} && { echo -n apache_mmn_; bzcat %{SOURCE0} | awk '/^#define MODULE_MAGIC_NUMBER_MAJOR/ {printf "%d", $3}'; })
 %define suse_maintenance_mmn  0
 %define	default_mpm	prefork
@@ -517,7 +522,7 @@ cp -p %{buildroot}/%{sysconfdir}/httpd.conf ./httpd.conf.default
 rm %{buildroot}/%{sysconfdir}/httpd-*.conf
 #
 # create directories
-mkdir -p %{buildroot}/%{_var}/adm/fillup-templates \
+mkdir -p %{buildroot}/%{_fillupdir} \
 	 %{buildroot}/%{proxycachedir} \
 	 %{buildroot}/%{localstatedir}
 #
@@ -574,7 +579,7 @@ mkdir -p %{buildroot}/%{sysconfdir}/vhosts.d
 #
 # install sysconfig template
 install -m 644 $RPM_SOURCE_DIR/sysconfig.%{name} \
-	%{buildroot}/%{_var}/adm/fillup-templates/sysconfig.%{name}
+	%{buildroot}/%{_fillupdir}/sysconfig.%{name}
 #
 # install configuration files:
 mkdir -p %{buildroot}/%{runtimedir}
@@ -609,7 +614,7 @@ EOF
 %if "%{_lib}" != "lib64"
 sed -e 's/lib64/%{_lib}/' -i \
   %{buildroot}/%{sysconfdir}/loadmodule.conf \
-  %{buildroot}/%{_var}/adm/fillup-templates/sysconfig.%{name}
+  %{buildroot}/%{_fillupdir}/sysconfig.%{name}
 %endif
 
 # remove configuration for mpms which have not been built
@@ -836,7 +841,7 @@ mv %{buildroot}/%{sysconfdir}/original .
 %{_sbindir}/suexec2
 %{iconsdir}
 %{errordir}
-%{_var}/adm/fillup-templates/sysconfig.%{name}
+%{_fillupdir}/sysconfig.%{name}
 %attr(755,root,root) %{_libdir}/%{name}_MMN
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/mod_*.so