From 57295488a139db2792c57952df336a8baf27701a Mon Sep 17 00:00:00 2001 From: Michael Young Date: Aug 23 2018 20:47:16 +0000 Subject: move creation of /usr/lib/xen symlink to posttrans to avoid rpm conflict --- diff --git a/xen.spec b/xen.spec index 423232a..598553a 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: 4%{?dist} +Release: 5%{?dist} Group: Development/Libraries License: GPLv2+ and LGPLv2+ and BSD URL: http://xen.org/ @@ -518,10 +518,6 @@ mkdir -p %{buildroot}%{_localstatedir}/log/xen/console 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}/%{_libexecdir}/%{name}/bin/qemu-system-i386 @@ -591,6 +587,14 @@ fi %systemd_postun %endif +%posttrans runtime +if [ ! -L /usr/lib/xen -a -d /usr/lib/xen -a -z "$(ls -A /usr/lib/xen)" ]; then + rmdir /usr/lib/xen +fi +if [ ! -e /usr/lib/xen ]; then + ln -s /usr/libexec/xen /usr/lib/xen +fi + %ldconfig_scriptlets libs %if %build_hyp @@ -740,7 +744,7 @@ fi %if "%{_libdir}" != "/usr/lib" %{_libdir}/%{name} %endif -/usr/lib/%{name} +%ghost /usr/lib/%{name} # General Xen state %dir %{_localstatedir}/lib/%{name} %dir %{_localstatedir}/lib/%{name}/dump @@ -867,6 +871,9 @@ fi %endif %changelog +* Thu Aug 23 2018 Michael Young - 4.11.0-5 +- move creation of /usr/lib/xen symlink to posttrans to avoid rpm conflict + * Fri Aug 17 2018 Michael Young - 4.11.0-4 - move files from /usr/lib/xen to /usr/libexec/xen - create symlink at /usr/lib/xen for compatibility