Accepting request 544864 from X11:XOrg

OBS-URL: https://build.opensuse.org/request/show/544864
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=350

xorg-x11-server.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:52:51 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Tue Nov 14 09:57:04 UTC 2017 - msrb@suse.com
 

xorg-x11-server.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
+
 %ifarch s390 s390x
 %define have_wayland 0
 %else
@@ -460,9 +465,9 @@ install -m 644 include/list.h \
          %{buildroot}%{_includedir}/xorg
 %endif
 %ifnarch s390 s390x
-mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+mkdir -p %{buildroot}%{_fillupdir}
 install -m 644 %_sourcedir/sysconfig.displaymanager.template \
-  %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager-%{name}
+  %{buildroot}%{_fillupdir}/sysconfig.displaymanager-%{name}
 %endif
 install -m 755 $RPM_SOURCE_DIR/xorg-backtrace %{buildroot}%{_bindir}/xorg-backtrace
 cp %{S:90} .
@@ -566,7 +571,7 @@ fi
 %{_libdir}/xorg/modules/
 %{_mandir}/man4/*
 %{_mandir}/man5/*
-%{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager-%{name}
+%{_fillupdir}/sysconfig.displaymanager-%{name}
 %{_localstatedir}/lib/X11/X
 %if 0%{?suse_version} >= 1315
 %ghost %{_sysconfdir}/alternatives/libglx.so