[qpid-cpp/f16] Merged qpid-cpp-server-daemon back in with qpid-cpp-server

[Darryl L. Pierce]

commit 38c4e751abda7dfd37a46e0c91339d817a593e21
Author: Darryl L. Pierce <dpierce at redhat.com>
Date:   Wed Sep 5 13:51:03 2012 -0400

    Merged qpid-cpp-server-daemon back in with qpid-cpp-server

 qpid-cpp.spec |   47 +++++++++++++----------------------------------
 1 files changed, 13 insertions(+), 34 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 9fcd4b7..e615fab 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -181,6 +181,7 @@ format for easy browsing.
 %package -n qpid-cpp-server
 Summary:   An AMQP message broker daemon
 Obsoletes: qpid-cpp-server-devel <= %{version}-%{release}
+Obsoletes: qpid-cpp-server-daemon <= %{version}-%{release}
 
 Requires:  qpid-cpp-client = %{version}-%{release}
 Requires:  cyrus-sasl
@@ -195,6 +196,7 @@ the open AMQP messaging protocol.
 %{_libdir}/qpid/daemon/replicating_listener.so
 %{_libdir}/qpid/daemon/replication_exchange.so
 %{_sbindir}/qpidd
+%{_initrddir}/qpidd
 %config(noreplace) %{_sysconfdir}/qpidd.conf
 %config(noreplace) %{_sysconfdir}/sasl2/qpidd.conf
 %dir %{_libdir}/qpid/daemon
@@ -211,32 +213,19 @@ getent passwd qpidd >/dev/null || \
     -c "Owner of Qpidd Daemons" qpidd
 exit 0
 
-
-
-%package -n qpid-cpp-server-daemon
-Summary:  Files for launching the AMQP message broker daemon
-
-Requires: qpid-cpp-server = %{version}-%{release}
-
-%description -n qpid-cpp-server-daemon
-%{summary}.
-
-%files -n qpid-cpp-server-daemon
-%{_initrddir}/qpidd
-
-%post -n qpid-cpp-server-daemon
+%post -n qpid-cpp-server
 # This adds the proper /etc/rc*.d links for the script
 /sbin/chkconfig --add qpidd
 /sbin/ldconfig
 
-%preun -n qpid-cpp-server-daemon
+%preun -n qpid-cpp-server
 # Check that this is actual deinstallation, not just removing for upgrade.
 if [ $1 = 0 ]; then
         /sbin/service qpidd stop >/dev/null 2>&1 || :
         /sbin/chkconfig --del qpidd
 fi
 
-%postun -n qpid-cpp-server-daemon
+%postun -n qpid-cpp-server
 if [ $1 -ge 1 ]; then
         /sbin/service qpidd condrestart >/dev/null 2>&1 || :
 fi
@@ -245,7 +234,7 @@ fi
 
 
 %package -n qpid-cpp-server-ha
-Summary: Provides the high available Qpid server
+Summary: Provides extensions to the AMQP message broker to provide high availability
 
 Requires: qpid-cpp-server = %{version}-%{release}
 Requires: qpid-qmf = %{version}-%{release}
@@ -255,32 +244,20 @@ Requires: qpid-qmf = %{version}-%{release}
 
 %files -n qpid-cpp-server-ha
 %{_bindir}/qpid-ha
-%{_libdir}/qpid/daemon/ha.so
-
-
-
-%package -n qpid-cpp-server-ha-daemon
-Summary: Files for launching the AMQP HA broker.
-
-Requires: qpid-cpp-server-ha = %{version}-%{release}
-
-%description -n qpid-cpp-server-ha-daemon
-%{summary}.
-
-%files -n qpid-cpp-server-ha-daemon
 %{_initrddir}/qpidd-primary
+%{_libdir}/qpid/daemon/ha.so
 
-%post -n qpid-cpp-server-ha-daemon
+%post -n qpid-cpp-server-ha
 /sbin/chkconfig --add qpidd-primary
 /sbin/ldconfig
 
-%preun -n qpid-cpp-server-ha-daemon
+%preun -n qpid-cpp-server-ha
 if [ $1 = 0 ]; then
   /sbin/service qpidd-primary stop > /dev/null 2>&1 || :
   /sbin/chkconfig --del qpidd-primary
 fi
 
-%postun -n qpid-cpp-server-ha-daemon
+%postun -n qpid-cpp-server-ha
 if [$1 -ge 1 ]; then
   /sbin/service qpidd-primary condrestart >/dev/null 2>&1 || :
 fi
@@ -786,7 +763,9 @@ rm -rf %{buildroot}
 %changelog
 * Wed Sep  5 2012 Darryl L. Pierce <dpierce at redhat.com> - 0.18-1
 - Rebased on Qpid release 0.18.
-- Added the new HA subpackages: qpid-cpp-server-ha, qpid-cpp-server-ha-daemon
+- Added the new HA subpackage: qpid-cpp-server-ha
+- Merged the qpid-cpp-server-daemon package back into qpid-cpp-server
+- Resolves: BZ#854263
 
 * Mon Aug 20 2012 Dan Horák <dan[at]danny.cz> - 0.16-5
 - allow build without InfiniBand eg. on s390(x)