[qpid-cpp/f16] Rebased on Qpid release 0.18.

Wed Sep 5 16:58:36 UTC 2012

commit 8c6eacc6fe2b122b8873a42e549f8f32252eaf70
Author: Darryl L. Pierce <dpierce at redhat.com>
Date:   Tue Sep 4 13:21:43 2012 -0400

    Rebased on Qpid release 0.18.
    
    - Added the new HA subpackages: qpid-cpp-server-ha, qpid-cpp-server-ha-daemon

 .gitignore                                         |    2 +
 ...ll-swig-.i-files-to-the-include-directory.patch |    0
 01-make-BrokerImportExport.h-public.patch          |  153 ----------
 ...e-target-to-generate-a-source-tarball-for.patch |  303 --------------------
 qpid-cpp.spec                                      |   76 ++++-
 sources                                            |    4 +-
 6 files changed, 66 insertions(+), 472 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index ac0d310..50803a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ store-0.7.3975.tar.gz
 /qpid-0.10.tar.gz
 /qpid-0.16.tar.gz
 /store-0.16.4509.tar.gz
+/qpid-0.18.tar.gz
+/store-0.18.4512.tar.gz
diff --git a/03-Relocated-all-swig-.i-files-to-the-include-directory.patch b/01-Relocated-all-swig-.i-files-to-the-include-directory.patch
similarity index 100%
rename from 03-Relocated-all-swig-.i-files-to-the-include-directory.patch
rename to 01-Relocated-all-swig-.i-files-to-the-include-directory.patch
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 8e6c1ab..9fcd4b7 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -6,8 +6,8 @@
 %{!?ruby_sitearch: %global ruby_sitearch %(/usr/bin/ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 # Release numbers
-%global qpid_svnrev  1336378
-%global store_svnrev 4509
+%global qpid_svnrev  1373004
+%global store_svnrev 4512
 # Change this release number for each build of the same qpid_svnrev, otherwise set back to 1.
 
 # LIBRARY VERSIONS
@@ -27,8 +27,8 @@
 %global LIB_VERSION_MAKE_PARAMS QPIDCOMMON_VERSION_INFO=%{QPIDCOMMON_VERSION_INFO} QPIDBROKER_VERSION_INFO=%{QPIDBROKER_VERSION_INFO} QPIDCLIENT_VERSION_INFO=%{QPIDCLIENT_VERSION_INFO} QPIDMESSAGING_VERSION_INFO=%{QPIDMESSAGING_VERSION_INFO} QMF_VERSION_INFO=%{QMF_VERSION_INFO} QMFENGINE_VERSION_INFO=%{QMFENGINE_VERSION_INFO} QMFCONSOLE_VERSION_INFO=%{QMFCONSOLE_VERSION_INFO} RDMAWRAP_VERSION_INFO=%{RDMAWRAP_VERSION_INFO} SSLCOMMON_VERSION_INFO=%{SSLCOMMON_VERSION_INFO}
 
 Name:           qpid-cpp
-Version:        0.16
-Release:        5%{?dist}
+Version:        0.18
+Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 License:        ASL 2.0
 URL:            http://qpid.apache.org
@@ -64,9 +64,7 @@ BuildRequires: xerces-c-devel
 BuildRequires: db4-devel
 BuildRequires: libaio-devel
 
-Patch1: 01-make-BrokerImportExport.h-public.patch
-Patch2: 02-Adds-a-Cmake-target-to-generate-a-source-tarball-for.patch
-Patch3: 03-Relocated-all-swig-.i-files-to-the-include-directory.patch
+Patch1: 01-Relocated-all-swig-.i-files-to-the-include-directory.patch
 
 %description
 
@@ -246,6 +244,50 @@ fi
 
 
 
+%package -n qpid-cpp-server-ha
+Summary: Provides the high available Qpid server
+
+Requires: qpid-cpp-server = %{version}-%{release}
+Requires: qpid-qmf = %{version}-%{release}
+
+%description -n qpid-cpp-server-ha
+%{summary}.
+
+%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
+
+%post -n qpid-cpp-server-ha-daemon
+/sbin/chkconfig --add qpidd-primary
+/sbin/ldconfig
+
+%preun -n qpid-cpp-server-ha-daemon
+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
+if [$1 -ge 1 ]; then
+  /sbin/service qpidd-primary condrestart >/dev/null 2>&1 || :
+fi
+/sbin/ldconfig
+
+
+
 %package -n qpid-qmf
 Summary:   The QPID Management Framework
 
@@ -557,8 +599,6 @@ Summary: Perl bindings for Apache Qpid Messaging
 %setup -q -T -D -b 1 -n qpid-%{version}
 
 %patch1 -p2
-%patch2 -p2
-%patch3 -p2
 
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
 
@@ -617,10 +657,18 @@ mkdir -p -m0755 %{buildroot}/%{_bindir}
 pushd %{_builddir}/qpid-%{version}/cpp
 make install DESTDIR=%{buildroot}
 
-install -Dp -m0755 etc/qpidd %{buildroot}%{_initrddir}/qpidd
+install -Dp -m0755 etc/qpidd %{buildroot}/%{_initrddir}/qpidd
 install -d -m0755 %{buildroot}%{_localstatedir}/lib/qpidd
 install -d -m0755 %{buildroot}%{_libdir}/qpidd
 install -d -m0755 %{buildroot}/var/run/qpidd
+
+#install the daemon files in the right location
+mkdir -p %{buildroot}/%{_initrddir}
+install %{buildroot}/%{_sysconfdir}/init.d/qpidd %{buildroot}/%{_initrddir}/qpidd
+rm -f %{buildroot}/%{_sysconfdir}/init.d/qpidd
+install %{buildroot}/%{_sysconfdir}/init.d/qpidd-primary %{buildroot}/%{_initrddir}/qpidd-primary
+rm -f %{buildroot}/%{_sysconfdir}/init.d/qpidd-primary
+
 # Install perftest utilities
 pushd src/tests/
 for ptest in %{perftests}; do
@@ -660,10 +708,6 @@ rm -rf %{buildroot}%{_datadir}/qpidc/examples/request-response
 rm -rf %{buildroot}%{_datadir}/qpidc/examples/tradedemo
 rm -rf %{buildroot}%{_datadir}/qpidc/examples/xml-exchange
 
-# remove HA files
-rm -rf %{buildroot}%{_libdir}/qpid/daemon/ha.so
-rm -rf %{buildroot}%{_bindir}/qpid-ha
-
 install -d %{buildroot}%{python_sitearch}
 install -pm 644 %{_builddir}/qpid-%{version}/cpp/bindings/qpid/python/cqpid.py %{buildroot}%{python_sitearch}
 install -pm 644 %{_builddir}/qpid-%{version}/cpp/bindings/qpid/python/.libs/_cqpid.so %{buildroot}%{python_sitearch}
@@ -740,6 +784,10 @@ 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
+
 * Mon Aug 20 2012 Dan Horák <dan[at]danny.cz> - 0.16-5
 - allow build without InfiniBand eg. on s390(x)
 - fix build on non-x86 64-bit arches
diff --git a/sources b/sources
index 1a38b16..506c66d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-39a4179477f1304f6a7aaaf45f49db99  qpid-0.16.tar.gz
-d4fe7f9bc124863031ca534d19b74920  store-0.16.4509.tar.gz
+081143304efacdf33d0c3f6c74c35271  qpid-0.18.tar.gz
+1d7c53d706f83a3c0402fca226462159  store-0.18.4512.tar.gz
