From: John Ferlan <jferlan(a)redhat.com>
For Fedora 17 and RHEL7 use systemd, so change the pegasus startup to use
that and make a dependency upon it.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
Reviewed-by: Wenchao Xia <xiawenc(a)linux.vnet.ibm.com>
Signed-off-by: Wenchao Xia <xiawenc(a)linux.vnet.ibm.com>
---
libvirt-cim.spec.in | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/libvirt-cim.spec.in b/libvirt-cim.spec.in
index 3def978..0679d7f 100644
--- a/libvirt-cim.spec.in
+++ b/libvirt-cim.spec.in
@@ -6,7 +6,7 @@ Version: @PACKAGE_VERSION@
Release: 1%{?dist}%{?extra_release}
License: LGPLv2+
Group: Development/Libraries
-Source: libvirt-cim-%{version}.tar.gz
+Source:
ftp://libvirt.org/libvirt-cim/libvirt-cim-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
URL:
http://libvirt.org/CIM/
Requires: libxml2 >= 2.6.0
@@ -27,6 +27,9 @@ BuildRequires: libconfig-devel
BuildRequires: libxml2-devel
BuildRequires: libcmpiutil-devel
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+BuildRequires: systemd-units
+%endif
BuildConflicts: sblim-cmpi-devel
%description
@@ -85,7 +88,12 @@ rm -fr $RPM_BUILD_ROOT
%{_datadir}/%{name}/install_base_schema.sh %{_datadir}/%{name}
-/etc/init.d/tog-pegasus condrestart
+# Fedora 17 / RHEL-7 are first where we use systemd.
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+ systemctl restart tog-pegasus
+%else
+ /etc/init.d/tog-pegasus condrestart
+%endif
%{_datadir}/%{name}/provider-register.sh -t pegasus \
-n @CIM_VIRT_NS@ \
--
1.7.1