From d87fe7c07578a1d61d654b3a97c05dd1606ef2983f42146523352eb7e7c1585d Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Fri, 24 Nov 2017 09:58:28 +0000
Subject: [PATCH] Accepting request 544762 from
 home:RBrownSUSE:branches:Virtualization

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

OBS-URL: https://build.opensuse.org/request/show/544762
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=642
---
 libvirt.changes |  6 ++++++
 libvirt.spec    | 23 ++++++++++++++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/libvirt.changes b/libvirt.changes
index fcce517..892100f 100644
--- a/libvirt.changes
+++ b/libvirt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Nov 23 13:47:54 UTC 2017 - rbrown@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
 -------------------------------------------------------------------
 Wed Nov 22 22:25:43 UTC 2017 - kukuk@suse.de
 
diff --git a/libvirt.spec b/libvirt.spec
index 016dfea..5af2342 100644
--- a/libvirt.spec
+++ b/libvirt.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
+
 # The hypervisor drivers that run in libvirtd
 %define with_xen           0%{!?_without_xen:1}
 %define with_qemu          0%{!?_without_qemu:1}
@@ -1199,12 +1204,12 @@ rm -f %{buildroot}/%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
 %endif
 
 # init scripts
-mkdir -p %{buildroot}/%{_localstatedir}/adm/fillup-templates
+mkdir -p %{buildroot}/%{_fillupdir}
 rm -f %{buildroot}/usr/lib/sysctl.d/60-libvirtd.conf
-mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirtd %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd
-mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlogd %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.virtlogd
-mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlockd %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd
-mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirt-guests %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests
+mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirtd %{buildroot}%{_fillupdir}/sysconfig.libvirtd
+mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlogd %{buildroot}/%{_fillupdir}/sysconfig.virtlogd
+mv %{buildroot}/%{_sysconfdir}/sysconfig/virtlockd %{buildroot}/%{_fillupdir}/sysconfig.virtlockd
+mv %{buildroot}/%{_sysconfdir}/sysconfig/libvirt-guests %{buildroot}/%{_fillupdir}/sysconfig.libvirt-guests
 # Provide rc symlink backward compatibility
 ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rclibvirtd
 ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcvirtlogd
@@ -1346,9 +1351,9 @@ fi
 %dir %{_libdir}/%{name}
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/hooks
-%{_localstatedir}/adm/fillup-templates/sysconfig.libvirtd
-%{_localstatedir}/adm/fillup-templates/sysconfig.virtlogd
-%{_localstatedir}/adm/fillup-templates/sysconfig.virtlockd
+%{_fillupdir}/sysconfig.libvirtd
+%{_fillupdir}/sysconfig.virtlogd
+%{_fillupdir}/sysconfig.virtlockd
 %{_unitdir}/libvirtd.service
 %{_unitdir}/virt-guest-shutdown.target
 %{_unitdir}/virtlogd.service
@@ -1597,7 +1602,7 @@ fi
 %{_bindir}/virt-host-validate
 %dir %{_libdir}/%{name}
 %attr(0755, root, root) %{_libdir}/%{name}/libvirt-guests.sh
-%{_localstatedir}/adm/fillup-templates/sysconfig.libvirt-guests
+%{_fillupdir}/sysconfig.libvirt-guests
 %{_unitdir}/libvirt-guests.service
 %{_sbindir}/rclibvirt-guests