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

Darryl L. Pierce mcpierce at fedoraproject.org
Wed Sep 5 19:14:22 UTC 2012 

commit 5e6228035413bea23dc19cf83c79a993763af347
Author: Darryl L. Pierce <dpierce at redhat.com>
Date:   Wed Sep 5 15:14:01 2012 -0400

    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

 .gitignore                                         |    2 +
 ...e-target-to-generate-a-source-tarball-for.patch |    0
 01-make-BrokerImportExport.h-public.patch          |  153 --------------------
 ...ll-swig-.i-files-to-the-include-directory.patch |    0
 02-Remove-colons-from-conditionals.patch           |   44 ------
 03-Fix-string-encoding.patch                       |   93 ------------
 qpid-cpp.spec                                      |   87 +++++++----
 sources                                            |    4 +-
 8 files changed, 60 insertions(+), 323 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/04-Adds-a-Cmake-target-to-generate-a-source-tarball-for.patch b/01-Adds-a-Cmake-target-to-generate-a-source-tarball-for.patch
similarity index 100%
rename from 04-Adds-a-Cmake-target-to-generate-a-source-tarball-for.patch
rename to 01-Adds-a-Cmake-target-to-generate-a-source-tarball-for.patch
diff --git a/05-Relocated-all-swig-.i-files-to-the-include-directory.patch b/02-Relocated-all-swig-.i-files-to-the-include-directory.patch
similarity index 100%
rename from 05-Relocated-all-swig-.i-files-to-the-include-directory.patch
rename to 02-Relocated-all-swig-.i-files-to-the-include-directory.patch
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 5101c29..d49eac1 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -8,8 +8,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
@@ -29,8 +29,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:        6%{?dist}
+Version:        0.18
+Release:        1%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 License:        ASL 2.0
 URL:            http://qpid.apache.org
@@ -66,11 +66,8 @@ BuildRequires: xerces-c-devel
 BuildRequires: db4-devel
 BuildRequires: libaio-devel
 
-Patch0: 01-make-BrokerImportExport.h-public.patch
-Patch1: 02-Remove-colons-from-conditionals.patch
-Patch2: 03-Fix-string-encoding.patch
-Patch3: 04-Adds-a-Cmake-target-to-generate-a-source-tarball-for.patch
-Patch4: 05-Relocated-all-swig-.i-files-to-the-include-directory.patch
+Patch1: 01-Adds-a-Cmake-target-to-generate-a-source-tarball-for.patch
+Patch2: 02-Relocated-all-swig-.i-files-to-the-include-directory.patch
 
 %description
 
@@ -187,6 +184,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
@@ -201,6 +199,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
@@ -217,34 +216,53 @@ getent passwd qpidd >/dev/null || \
     -c "Owner of Qpidd Daemons" qpidd
 exit 0
 
+%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
+# 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
+if [ $1 -ge 1 ]; then
+        /sbin/service qpidd condrestart >/dev/null 2>&1 || :
+fi
+/sbin/ldconfig
+
 
 
-%package -n qpid-cpp-server-daemon
-Summary:  Files for launching the AMQP message broker daemon
+%package -n qpid-cpp-server-ha
+Summary: Provides extensions to the AMQP message broker to provide high availability
 
 Requires: qpid-cpp-server = %{version}-%{release}
+Requires: qpid-qmf = %{version}-%{release}
 
-%description -n qpid-cpp-server-daemon
+%description -n qpid-cpp-server-ha
 %{summary}.
 
-%files -n qpid-cpp-server-daemon
-%{_initrddir}/qpidd
+%files -n qpid-cpp-server-ha
+%{_bindir}/qpid-ha
+%{_initrddir}/qpidd-primary
+%{_libdir}/qpid/daemon/ha.so
 
-%post -n qpid-cpp-server-daemon
-# This adds the proper /etc/rc*.d links for the script
-/sbin/chkconfig --add qpidd
+%post -n qpid-cpp-server-ha
+/sbin/chkconfig --add qpidd-primary
 /sbin/ldconfig
 
-%preun -n qpid-cpp-server-daemon
-# Check that this is actual deinstallation, not just removing for upgrade.
+%preun -n qpid-cpp-server-ha
 if [ $1 = 0 ]; then
-        /sbin/service qpidd stop >/dev/null 2>&1 || :
-        /sbin/chkconfig --del qpidd
+  /sbin/service qpidd-primary stop > /dev/null 2>&1 || :
+  /sbin/chkconfig --del qpidd-primary
 fi
 
-%postun -n qpid-cpp-server-daemon
-if [ $1 -ge 1 ]; then
-        /sbin/service qpidd condrestart >/dev/null 2>&1 || :
+%postun -n qpid-cpp-server-ha
+if [$1 -ge 1 ]; then
+  /sbin/service qpidd-primary condrestart >/dev/null 2>&1 || :
 fi
 /sbin/ldconfig
 
@@ -559,11 +577,8 @@ Summary: Perl bindings for Apache Qpid Messaging
 %setup -q -n qpid-%{version}
 %setup -q -T -D -b 1 -n qpid-%{version}
 
-%patch0 -p2
 %patch1 -p2
 %patch2 -p2
-%patch3 -p2
-%patch4 -p2
 
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
 
@@ -626,6 +641,14 @@ 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
@@ -665,10 +688,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}
@@ -745,6 +764,12 @@ 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 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-6
 - 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

More information about the scm-commits mailing list