[libvirt-qmf/f16] Start with matahari settings under systemd

[Zane Bitter]

commit 635e7fb8efabecf7d360341fa70c2820163ba2a1
Author: Zane Bitter <zbitter at redhat.com>
Date:   Wed Sep 14 16:53:59 2011 +0200

    Start with matahari settings under systemd

 libvirt-qmf.service |    9 +++++----
 libvirt-qmf.spec    |    5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/libvirt-qmf.service b/libvirt-qmf.service
index edaab3d..6999bd8 100644
--- a/libvirt-qmf.service
+++ b/libvirt-qmf.service
@@ -1,10 +1,11 @@
 [Unit]
-Description=Libvirt Via Qpid Gateway Daemon
-After=syslog.target network.target
+Description=Matahari libvirt daemon using the AMQP protocol.
+After=syslog.target network.target matahari-broker.service
+Requires=syslog.target network.target
 
 [Service]
-EnvironmentFile=-/etc/sysconfig/libvirt-qpid
-ExecStart=/usr/sbin/libvirt-qpid $LIBVIRT_QPID_ARGS
+EnvironmentFile=-/etc/sysconfig/matahari
+ExecStart=/usr/sbin/libvirt-qpid $MATAHARI_AGENT_ARGS $libvirt_qmf_AGENT_ARGS
 
 [Install]
 WantedBy=multi-user.target
diff --git a/libvirt-qmf.spec b/libvirt-qmf.spec
index c750cc9..c1e9e65 100644
--- a/libvirt-qmf.spec
+++ b/libvirt-qmf.spec
@@ -1,6 +1,6 @@
 Name: libvirt-qmf
 Version: 0.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: QPid QMF interface to Libvirt
 Source0: https://github.com/matahari/libvirt-qmf/downloads/%{name}-%{version}.tar.gz
 Source1: libvirt-qmf.service
@@ -89,6 +89,9 @@ fi
 
 
 %changelog
+* Wed Sep 14 2011 Zane Bitter <zbitter at redhat.com> - 0.3.0-4
+- Start with matahari settings under systemd
+
 * Mon Sep 12 2011 Tom Callaway <spot at fedoraproject.org> - 0.3.0-3
 - convert to systemd