Merge "Changes the qpid package that gets installed on Fedora"

This commit is contained in:
Jenkins 2012-09-13 19:13:27 +00:00 committed by Gerrit Code Review
commit d85135ee40
3 changed files with 3 additions and 3 deletions

View File

@ -35,7 +35,7 @@ python-sqlalchemy
python-suds python-suds
python-tempita python-tempita
rabbitmq-server # NOPRIME rabbitmq-server # NOPRIME
qpid-cpp-server # NOPRIME qpid-cpp-server-daemon # NOPRIME
sqlite sqlite
sudo sudo
vconfig vconfig

View File

@ -17,7 +17,7 @@ python-routes
python-sqlalchemy python-sqlalchemy
python-suds python-suds
rabbitmq-server # NOPRIME rabbitmq-server # NOPRIME
qpid-cpp-server # NOPRIME qpid-cpp-server-daemon # NOPRIME
sqlite sqlite
sudo sudo
vconfig vconfig

View File

@ -663,7 +663,7 @@ if is_service_enabled rabbit; then
rm -f "$tfile" rm -f "$tfile"
elif is_service_enabled qpid; then elif is_service_enabled qpid; then
if [[ "$os_PACKAGE" = "rpm" ]]; then if [[ "$os_PACKAGE" = "rpm" ]]; then
install_package qpid-cpp-server install_package qpid-cpp-server-daemon
else else
install_package qpidd install_package qpidd
fi fi