[xen] relocate systemd files for fc17+
myoung
myoung at fedoraproject.org
Wed Feb 8 21:45:27 UTC 2012
commit 85795939e197969964bea515fdd7818a20e0fc1d
Author: Michael Young <m.a.young at durham.ac.uk>
Date: Wed Feb 8 21:42:05 2012 +0000
relocate systemd files for fc17+
xen.spec | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
---
diff --git a/xen.spec b/xen.spec
index e3cbc9d..ccdb24f 100644
--- a/xen.spec
+++ b/xen.spec
@@ -3,6 +3,11 @@
# or ocamlopt is missing (the xen makefile doesn't build ocaml bits if it isn't there)
%define with_ocaml %{?_without_ocaml: 0} %{?!_without_ocaml: 1}
%define build_ocaml %(test -x %{_bindir}/ocamlopt && echo %{with_ocaml} || echo 0)
+%if "%dist" >= ".fc17"
+%define systemddir /usr/lib/systemd
+%else
+%define systemddir /lib/systemd
+%endif
# Hypervisor ABI
%define hv_abi 4.1
@@ -10,7 +15,7 @@
Summary: Xen is a virtual machine monitor
Name: xen
Version: 4.1.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Group: Development/Libraries
License: GPLv2+ and LGPLv2+ and BSD
URL: http://xen.org/
@@ -331,13 +336,13 @@ install -m 644 %{SOURCE31} %{buildroot}%{_sysconfdir}/sysconfig/xenconsoled
install -m 644 %{SOURCE32} %{buildroot}%{_sysconfdir}/sysconfig/blktapctrl
# sysconfig
-mkdir -p %{buildroot}/lib/systemd/system
-install -m 644 %{SOURCE40} %{buildroot}/lib/systemd/system/proc-xen.mount
-install -m 644 %{SOURCE41} %{buildroot}/lib/systemd/system/var-lib-xenstored.mount
-install -m 644 %{SOURCE42} %{buildroot}/lib/systemd/system/xenstored.service
-install -m 644 %{SOURCE43} %{buildroot}/lib/systemd/system/blktapctrl.service
-install -m 644 %{SOURCE44} %{buildroot}/lib/systemd/system/xend.service
-install -m 644 %{SOURCE45} %{buildroot}/lib/systemd/system/xenconsoled.service
+mkdir -p %{buildroot}%{systemddir}/system
+install -m 644 %{SOURCE40} %{buildroot}%{systemddir}/system/proc-xen.mount
+install -m 644 %{SOURCE41} %{buildroot}%{systemddir}/system/var-lib-xenstored.mount
+install -m 644 %{SOURCE42} %{buildroot}%{systemddir}/system/xenstored.service
+install -m 644 %{SOURCE43} %{buildroot}%{systemddir}/system/blktapctrl.service
+install -m 644 %{SOURCE44} %{buildroot}%{systemddir}/system/xend.service
+install -m 644 %{SOURCE45} %{buildroot}%{systemddir}/system/xenconsoled.service
# config file only used for hotplug, Fedora uses udev instead
rm -f %{buildroot}/%{_sysconfdir}/sysconfig/xend
@@ -451,7 +456,7 @@ rm -rf %{buildroot}
# Autostart of guests
%config(noreplace) %{_sysconfdir}/sysconfig/xendomains
-/lib/systemd/system/xend.service
+%{systemddir}/system/xend.service
# Persistent state for XenD
%dir %{_localstatedir}/lib/%{name}/xend-db/
@@ -481,11 +486,11 @@ rm -rf %{buildroot}
%{_sysconfdir}/rc.d/init.d/xencommons
%{_sysconfdir}/bash_completion.d/xl.sh
-/lib/systemd/system/proc-xen.mount
-/lib/systemd/system/var-lib-xenstored.mount
-/lib/systemd/system/xenstored.service
-/lib/systemd/system/blktapctrl.service
-/lib/systemd/system/xenconsoled.service
+%{systemddir}/system/proc-xen.mount
+%{systemddir}/system/var-lib-xenstored.mount
+%{systemddir}/system/xenstored.service
+%{systemddir}/system/blktapctrl.service
+%{systemddir}/system/xenconsoled.service
%config(noreplace) %{_sysconfdir}/sysconfig/xenstored
%config(noreplace) %{_sysconfdir}/sysconfig/xenconsoled
@@ -638,6 +643,9 @@ rm -rf %{buildroot}
%endif
%changelog
+* Wed Feb 08 2012 Michael Young <m.a.young at durham.ac.uk> - 4.1.2-8
+- relocate systemd files for fc17+
+
* Tue Feb 07 2012 Michael Young <m.a.young at durham.ac.uk> - 4.1.2-7
- move xend and xenconsoled to systemd
More information about the scm-commits
mailing list