[qpid-cpp] Rebased on Qpid 0.28.
Darryl L. Pierce
mcpierce at fedoraproject.org
Wed Jun 4 18:51:53 UTC 2014
commit bfae67b94afdb45a98858c1c1e0b51f3a9ac23bc
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date: Wed Jun 4 14:51:52 2014 -0400
Rebased on Qpid 0.28.
.gitignore | 1 +
...JIRA-qpidd.service-file-for-use-on-Fedora.patch | 6 +-
0002-NO-JIRA-Remove-unused-code.patch | 67 +
...ix-for-recovery-ambiguity-issue-other-cod.patch | 5363 --------------------
...rovide-the-right-Perl-packages-in-top-lev.patch | 39 -
...ix-Ruby-Perl-bindings-when-built-with-Wer.patch | 184 -
...pdated-Ruby-bindings-to-build-under-CMake.patch | 61 -
0006-QPID-5718-Dead-code-in-the-HA-codebase.patch | 42 -
0007-NO-JIRA-Remove-dead-code.patch | 52 -
...-NO-JIRA-Bumped-max-Proton-version-to-0.7.patch | 25 -
qpid-cpp.spec | 32 +-
sources | 2 +-
12 files changed, 84 insertions(+), 5790 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f2ff42f..6afc101 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ store-0.7.3975.tar.gz
/qpid-cpp-0.22.tar.gz
/qpid-0.24.tar.gz
/qpid-0.26.tar.gz
+/qpid-0.28.tar.gz
diff --git a/0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch b/0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
index 17f4119..534ec67 100644
--- a/0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
+++ b/0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
@@ -1,7 +1,7 @@
-From 99c3da2bad54d640348b9c81c78ff160cc8c1d6e Mon Sep 17 00:00:00 2001
+From a4dfca94cd18f54810d78d2c5916e9addd807937 Mon Sep 17 00:00:00 2001
From: "Darryl L. Pierce" <mcpierce at gmail.com>
Date: Wed, 3 Apr 2013 10:07:37 -0400
-Subject: [PATCH 1/7] NO-JIRA: qpidd.service file for use on Fedora
+Subject: [PATCH 1/2] NO-JIRA: qpidd.service file for use on Fedora
This patch provides the needed systemd file for running the Qpid broker
as a service.
@@ -54,5 +54,5 @@ index 0000000..10a99d1
+[Install]
+WantedBy=multi-user.target
--
-1.9.0
+1.9.3
diff --git a/0002-NO-JIRA-Remove-unused-code.patch b/0002-NO-JIRA-Remove-unused-code.patch
new file mode 100644
index 0000000..3fc0609
--- /dev/null
+++ b/0002-NO-JIRA-Remove-unused-code.patch
@@ -0,0 +1,67 @@
+From 4a97f3b736e3f604f018777b5a04abb7b60daccf Mon Sep 17 00:00:00 2001
+From: "Darryl L. Pierce" <dpierce at redhat.com>
+Date: Wed, 4 Jun 2014 10:42:48 -0400
+Subject: [PATCH 2/2] NO-JIRA: Remove unused code
+
+---
+ qpid/cpp/src/qpid/ha/RemoteBackup.cpp | 6 ------
+ qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp | 7 -------
+ qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp | 7 -------
+ 3 files changed, 20 deletions(-)
+
+diff --git a/qpid/cpp/src/qpid/ha/RemoteBackup.cpp b/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
+index bf3d779..feee116 100644
+--- a/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
++++ b/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
+@@ -91,12 +91,6 @@ struct QueueSetPrinter {
+ std::string prefix;
+ QueueSetPrinter(const std::string& p, const QS& q) : qs(q), prefix(p) {}
+ };
+-std::ostream& operator<<(std::ostream& o, const QueueSetPrinter& qp) {
+- if (!qp.qs.empty()) o << qp.prefix;
+- for (QS::const_iterator i = qp.qs.begin(); i != qp.qs.end(); ++i)
+- o << (*i)->getName() << " ";
+- return o;
+-}
+ }
+
+ void RemoteBackup::ready(const QueuePtr& q) {
+diff --git a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
+index 635d504..4c3823c 100644
+--- a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
++++ b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.cpp
+@@ -86,13 +86,6 @@ ReplicatingSubscription::Factory::create(
+ return rs;
+ }
+
+-namespace {
+-void copyIf(boost::shared_ptr<MessageInterceptor> from, boost::shared_ptr<IdSetter>& to) {
+- boost::shared_ptr<IdSetter> result = boost::dynamic_pointer_cast<IdSetter>(from);
+- if (result) to = result;
+-}
+-} // namespace
+-
+ ReplicatingSubscription::ReplicatingSubscription(
+ HaBroker& hb,
+ SemanticState* parent,
+diff --git a/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
+index 3dbacac..21d8238 100644
+--- a/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
++++ b/qpid/cpp/src/qpid/messaging/amqp/AddressHelper.cpp
+@@ -135,13 +135,6 @@ uint64_t getFilterDescriptor(const std::string& key)
+ {
+ return hasWildcards(key) ? qpid::amqp::filters::LEGACY_TOPIC_FILTER_CODE : qpid::amqp::filters::LEGACY_DIRECT_FILTER_CODE;
+ }
+-bool contains(const Variant::List& list, const std::string& item)
+-{
+- for (Variant::List::const_iterator i = list.begin(); i != list.end(); ++i) {
+- if (*i == item) return true;
+- }
+- return false;
+-}
+
+ bool test(const Variant::Map& options, const std::string& name)
+ {
+--
+1.9.3
+
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 4b6c969..f56d5f6 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -2,21 +2,15 @@
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Name: qpid-cpp
-Version: 0.26
-Release: 9%{?dist}
+Version: 0.28
+Release: 1%{?dist}
Summary: Libraries for Qpid C++ client applications
License: ASL 2.0
URL: http://qpid.apache.org
Source0: http://www.apache.org/dist/qpid/%{version}/qpid-%{version}.tar.gz
-Patch01: 0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
-Patch02: 0002-QPID-4984-Fix-for-recovery-ambiguity-issue-other-cod.patch
-Patch03: 0003-QPID-5556-Provide-the-right-Perl-packages-in-top-lev.patch
-Patch04: 0004-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch
-Patch05: 0005-QPID-5656-Updated-Ruby-bindings-to-build-under-CMake.patch
-Patch06: 0006-QPID-5718-Dead-code-in-the-HA-codebase.patch
-Patch07: 0007-NO-JIRA-Remove-dead-code.patch
-Patch08: 0008-NO-JIRA-Bumped-max-Proton-version-to-0.7.patch
+Patch0001: 0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
+Patch0002: 0002-NO-JIRA-Remove-unused-code.patch
BuildRequires: gcc-c++
BuildRequires: cmake
@@ -150,6 +144,7 @@ in C++ using Qpid. Qpid implements the AMQP messaging specification.
%{_bindir}/qpid-client-test
%{_bindir}/qpid-txtest
%{_libexecdir}/qpid/tests
+%{_libdir}/cmake/Qpid
%post client-devel -p /sbin/ldconfig
@@ -364,8 +359,6 @@ with Berkeley DB.
%package -n qpid-tools
Summary: Management and diagnostic tools for Apache Qpid
-BuildArch: noarch
-
Requires: python-qpid >= 0.8
Requires: python-qpid-qmf
@@ -379,6 +372,8 @@ Management and diagnostic tools for Apache Qpid brokers and clients.
%{_bindir}/qpid-route
%{_bindir}/qpid-stat
%{_bindir}/qpid-tool
+%{_bindir}/qpid-receive
+%{_bindir}/qpid-send
%doc LICENSE NOTICE
%if "%{python_version}" >= "2.6"
%{python_sitelib}/qpid_tools-*.egg-info
@@ -391,14 +386,8 @@ Management and diagnostic tools for Apache Qpid brokers and clients.
%prep
%setup -q -n qpid-%{version}
-%patch01 -p2
-%patch02 -p2
-%patch03 -p2
-%patch04 -p2
-%patch05 -p2
-%patch06 -p2
-%patch07 -p2
-%patch08 -p2
+%patch0001 -p2
+%patch0002 -p2
%global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
@@ -494,6 +483,9 @@ rm -rf %{buildroot}/usr/local/%{_lib}/ruby/site_ruby
%changelog
+* Wed Jun 4 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.28-1
+- Rebased on Qpid 0.28.
+
* Tue Jun 3 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.26-9
- Fixed dependency of server-ha on qpid(server).
diff --git a/sources b/sources
index b6d19fa..b45c371 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31c4a058654c91f28ad6bfdcb0e7371e qpid-0.26.tar.gz
+db0422dc4f17febf9f1039509fd7ad83 qpid-0.28.tar.gz
More information about the scm-commits
mailing list