[qpid-cpp/f16] Merged the qpid-cpp-server-daemon package back into qpid-cpp-server

[Darryl L. Pierce]

commit b96baa45bc8c6494ae6198bff2b04a468f27e457
Author: Darryl L. Pierce <dpierce at redhat.com>
Date:   Wed Sep 5 13:54:34 2012 -0400

    Merged the qpid-cpp-server-daemon package back into qpid-cpp-server
    
    - Resolves: BZ#854263

 qpid-cpp.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index e615fab..5fc066d 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -28,7 +28,7 @@
 
 Name:           qpid-cpp
 Version:        0.18
-Release:        1%{?dist}
+Release:        1.1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 License:        ASL 2.0
 URL:            http://qpid.apache.org
@@ -761,11 +761,13 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep  5 2012 Darryl L. Pierce <dpierce at redhat.com> - 0.18-1.1
+- Merged the qpid-cpp-server-daemon package back into qpid-cpp-server
+- Resolves: BZ#854263
+
 * Wed Sep  5 2012 Darryl L. Pierce <dpierce at redhat.com> - 0.18-1
 - Rebased on Qpid release 0.18.
 - 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)