From 20df2a839d9e890ef5dc065777dcba4642e7416d Mon Sep 17 00:00:00 2001
From: Nikola Dipanov <ndipanov@redhat.com>
Date: Sat, 8 Sep 2012 18:36:35 +0200
Subject: [PATCH] Changes the qpid package that gets installed on Fedora

Changes the qpid package that will be installed on Fedora when
running stack.sh. The original package (qpid-cpp-server) was
split up into qpid-cpp-server and qpid-cpp-server-daemon.
systemd unit files were moved into the second package and
if only the first package is installed, qpid service  fails
to start.

Change-Id: Ia7cae795d7e456f0e21e0bedaee583a9e8b35f2d
---
 files/rpms/nova    | 2 +-
 files/rpms/quantum | 2 +-
 stack.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/rpms/nova b/files/rpms/nova
index bb920267bb..88ad8c3183 100644
--- a/files/rpms/nova
+++ b/files/rpms/nova
@@ -35,7 +35,7 @@ python-sqlalchemy
 python-suds
 python-tempita
 rabbitmq-server # NOPRIME
-qpid-cpp-server # NOPRIME
+qpid-cpp-server-daemon # NOPRIME
 sqlite
 sudo
 vconfig
diff --git a/files/rpms/quantum b/files/rpms/quantum
index 6ca9c35520..05398fcf85 100644
--- a/files/rpms/quantum
+++ b/files/rpms/quantum
@@ -17,7 +17,7 @@ python-routes
 python-sqlalchemy
 python-suds
 rabbitmq-server # NOPRIME
-qpid-cpp-server # NOPRIME
+qpid-cpp-server-daemon # NOPRIME
 sqlite
 sudo
 vconfig
diff --git a/stack.sh b/stack.sh
index 3e3d8cf5bc..87e3336d6b 100755
--- a/stack.sh
+++ b/stack.sh
@@ -668,7 +668,7 @@ if is_service_enabled rabbit; then
     rm -f "$tfile"
 elif is_service_enabled qpid; then
     if [[ "$os_PACKAGE" = "rpm" ]]; then
-        install_package qpid-cpp-server
+        install_package qpid-cpp-server-daemon
     else
         install_package qpidd
     fi