From a6bb4c145b730e71c6cc04a0b38a65c91addff67 Mon Sep 17 00:00:00 2001
From: Michael Young <m.a.young@durham.ac.uk>
Date: Aug 17 2018 20:36:44 +0000
Subject: move files from /usr/lib/xen to /usr/libexec/xen


---

diff --git a/xen.spec b/xen.spec
index 96dcd30..423232a 100644
--- a/xen.spec
+++ b/xen.spec
@@ -60,7 +60,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 4.11.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group:   Development/Libraries
 License: GPLv2+ and LGPLv2+ and BSD
 URL:     http://xen.org/
@@ -398,7 +398,7 @@ CONFIG_EXTRA="--disable-qemu-traditional"
 %else
 CONFIG_EXTRA=""
 %endif
-./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-system-seabios=%{seabiosloc} --with-system-qemu=/usr/bin/qemu-system-i386 --with-linux-backend-modules="xen-evtchn xen-gntdev xen-gntalloc xen-blkback xen-netback xen-pciback xen-scsiback xen-acpi-processor" $CONFIG_EXTRA
+./configure --prefix=%{_prefix} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --with-system-seabios=%{seabiosloc} --with-system-qemu=/usr/bin/qemu-system-i386 --with-linux-backend-modules="xen-evtchn xen-gntdev xen-gntalloc xen-blkback xen-netback xen-pciback xen-scsiback xen-acpi-processor" $CONFIG_EXTRA
 make %{?_smp_mflags} %{?ocaml_flags} prefix=/usr tools
 %if %build_docs
 make                 prefix=/usr docs
@@ -515,11 +515,15 @@ mkdir -p %{buildroot}%{_localstatedir}/log/xen/console
 ############ create symlink for x86_64 for compatibility with 4.4 ############
 
 %if "%{_libdir}" != "/usr/lib"
-ln -s /usr/lib/%{name} %{buildroot}/%{_libdir}/%{name}
+ln -s %{_libexecdir}/%{name} %{buildroot}/%{_libdir}/%{name}
 %endif
 
+############ create symlink for compatibility with pre 4.11.0-4 ############
+
+ln -s %{_libexecdir}/%{name} %{buildroot}/usr/lib/%{name}
+
 ############ create symlink to qemu-system-i386 in /usr/bin ############
-ln -s /usr/bin/qemu-system-i386 %{buildroot}/usr/lib/%{name}/bin/qemu-system-i386
+ln -s /usr/bin/qemu-system-i386 %{buildroot}/%{_libexecdir}/%{name}/bin/qemu-system-i386
 
 ############ debug packaging: list files ############
 
@@ -683,9 +687,9 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/xen
 
 # Programs run by other programs
-%dir /usr/lib/%{name}
-%dir /usr/lib/%{name}/bin
-%attr(0700,root,root) /usr/lib/%{name}/bin/*
+%dir %{_libexecdir}/%{name}
+%dir %{_libexecdir}/%{name}/bin
+%attr(0700,root,root) %{_libexecdir}/%{name}/bin/*
 # QEMU runtime files
 %if %build_qemutrad
 %ifnarch armv7hl aarch64
@@ -721,21 +725,22 @@ fi
 
 # The firmware
 %ifarch %{ix86} x86_64
-%dir /usr/lib/%{name}/boot
-/usr/lib/xen/boot/hvmloader
+%dir %{_libexecdir}/%{name}/boot
+%{_libexecdir}/xen/boot/hvmloader
 %ifnarch %{ix86}
-/usr/lib/xen/boot/xen-shim
-/usr/lib/debug/usr/lib/xen/boot/xen-shim-syms
+%{_libexecdir}/%{name}/boot/xen-shim
+/usr/lib/debug%{_libexecdir}/xen/boot/xen-shim-syms
 %endif
 %if %build_stubdom
-/usr/lib/xen/boot/ioemu-stubdom.gz
-/usr/lib/xen/boot/xenstore-stubdom.gz
-/usr/lib/xen/boot/pv-grub*.gz
+%{_libexecdir}/xen/boot/ioemu-stubdom.gz
+%{_libexecdir}/xen/boot/xenstore-stubdom.gz
+%{_libexecdir}/xen/boot/pv-grub*.gz
 %endif
 %endif
 %if "%{_libdir}" != "/usr/lib"
 %{_libdir}/%{name}
 %endif
+/usr/lib/%{name}
 # General Xen state
 %dir %{_localstatedir}/lib/%{name}
 %dir %{_localstatedir}/lib/%{name}/dump
@@ -862,6 +867,10 @@ fi
 %endif
 
 %changelog
+* Fri Aug 17 2018 Michael Young <m.a.young@durham.ac.uk> - 4.11.0-4
+- move files from /usr/lib/xen to /usr/libexec/xen
+- create symlink at /usr/lib/xen for compatibility
+
 * Tue Aug 14 2018 Michael Young <m.a.young@durham.ac.uk> - 4.11.0-3
 - replace use of deprecated vwprintw