[qpid-qmf] Rebased on Qpid 0.28.
Darryl L. Pierce
mcpierce at fedoraproject.org
Thu Jun 5 13:14:03 UTC 2014
commit 2b4588948378d18b32d71343492799021a01691c
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date: Thu Jun 5 09:13:59 2014 -0400
Rebased on Qpid 0.28.
.gitignore | 2 +
...ixed-installing-the-qmfgen-Python-package.patch | 29 --------
0001-NO-JIRA-Remove-unused-code.patch | 67 +++++++++++++++++++
...pdated-Ruby-bindings-to-build-under-CMake.patch | 42 +++---------
...-explicit-language-references-to-all-sheb.patch | 37 -----------
...ix-Ruby-Perl-bindings-when-built-with-Wer.patch | 69 --------------------
...PID-5499-Perl-changes-for-format-security.patch | 25 -------
05-QPID-5718-Dead-code-in-the-HA-codebase.patch | 42 ------------
06-NO-JIRA-Remove-dead-code.patch | 32 ---------
qpid-qmf.spec | 51 +++++----------
sources | 2 +-
11 files changed, 97 insertions(+), 301 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f1a6f32..19a6155 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/qpid-0.24.tar.gz
+/qpid-qmf-0.28.tar.gz
+/qpid-0.28.tar.gz
diff --git a/0001-NO-JIRA-Remove-unused-code.patch b/0001-NO-JIRA-Remove-unused-code.patch
new file mode 100644
index 0000000..17118d9
--- /dev/null
+++ b/0001-NO-JIRA-Remove-unused-code.patch
@@ -0,0 +1,67 @@
+From 270c801fc76d57e13085255659ba69b5c81e2a71 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 1/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/04-QPID-5656-Updated-Ruby-bindings-to-build-under-CMake.patch b/0002-QPID-5656-Updated-Ruby-bindings-to-build-under-CMake.patch
similarity index 60%
rename from 04-QPID-5656-Updated-Ruby-bindings-to-build-under-CMake.patch
rename to 0002-QPID-5656-Updated-Ruby-bindings-to-build-under-CMake.patch
index 1a57e81..ea9311d 100644
--- a/04-QPID-5656-Updated-Ruby-bindings-to-build-under-CMake.patch
+++ b/0002-QPID-5656-Updated-Ruby-bindings-to-build-under-CMake.patch
@@ -1,42 +1,20 @@
-From f03365c39909dafc448fd02cef68021b4a4e9659 Mon Sep 17 00:00:00 2001
+From 0419bddb27bc729073e459feea9b326f391e46fe Mon Sep 17 00:00:00 2001
From: "Darryl L. Pierce" <dpierce at redhat.com>
Date: Tue, 1 Apr 2014 16:12:48 -0400
-Subject: [PATCH 2/3] QPID-5656: Updated Ruby bindings to build under CMake 3.0
+Subject: [PATCH 2/2] QPID-5656: Updated Ruby bindings to build under CMake 3.0
CMake 3.0 has reverted to the CMake 2.6 naming for libraries. prepending
"lib" to only the Ruby library names.
---
- qpid/cpp/bindings/qmf/ruby/CMakeLists.txt | 6 ++++--
qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt | 6 ++++--
qpid/cpp/bindings/qpid/ruby/CMakeLists.txt | 6 ++++--
- 3 files changed, 12 insertions(+), 6 deletions(-)
+ 2 files changed, 8 insertions(+), 4 deletions(-)
-diff --git a/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt b/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt
-index 37ce732..88d10ca 100644
---- a/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt
-+++ b/qpid/cpp/bindings/qmf/ruby/CMakeLists.txt
-@@ -36,7 +36,8 @@ swig_link_libraries(qmfengine_ruby qmf qmfconsole ${RUBY_LIBRARY})
- ##----------------------------------
- ## Install the complete Ruby binding
- ##----------------------------------
--if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
-+if ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8) OR
-+ (${CMAKE_MAJOR_VERSION} EQUAL 3))
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmfengine_ruby.so
- RENAME qmfengine.so
- DESTINATION ${RUBY_PFX_ARCH_DIR}
-@@ -48,4 +49,5 @@ else()
- DESTINATION ${RUBY_PFX_ARCH_DIR}
- COMPONENT ${QPID_COMPONENT_CLIENT}
- )
--endif ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8))
-+endif ((${CMAKE_MAJOR_VERSION} EQUAL 2) AND (${CMAKE_MINOR_VERSION} LESS 8) OR
-+ (${CMAKE_MAJOR_VERSION} EQUAL 3))
diff --git a/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt b/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
-index 4ea61ab..19fe4bf 100644
+index c40480f..2d81199 100644
--- a/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
+++ b/qpid/cpp/bindings/qmf2/ruby/CMakeLists.txt
-@@ -36,7 +36,8 @@ swig_link_libraries(cqmf2_ruby qmf2 ${RUBY_LIBRARY})
+@@ -42,7 +42,8 @@ swig_link_libraries(cqmf2_ruby qmf2 ${RUBY_LIBRARY})
##----------------------------------
## Install the complete Ruby binding
##----------------------------------
@@ -46,7 +24,7 @@ index 4ea61ab..19fe4bf 100644
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cqmf2_ruby.so
RENAME cqmf2.so
DESTINATION ${RUBY_PFX_ARCH_DIR}
-@@ -48,5 +49,6 @@ else()
+@@ -54,5 +55,6 @@ else()
DESTINATION ${RUBY_PFX_ARCH_DIR}
COMPONENT ${QPID_COMPONENT_CLIENT}
)
@@ -55,10 +33,10 @@ index 4ea61ab..19fe4bf 100644
+ (${CMAKE_MAJOR_VERSION} EQUAL 2))
diff --git a/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt b/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
-index a56fac7..ec12f00 100644
+index f80f134..7d0b7ed 100644
--- a/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
+++ b/qpid/cpp/bindings/qpid/ruby/CMakeLists.txt
-@@ -47,7 +47,8 @@ set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_F
+@@ -53,7 +53,8 @@ set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_F
##----------------------------------
## Install the complete Ruby binding
##----------------------------------
@@ -68,7 +46,7 @@ index a56fac7..ec12f00 100644
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cqpid_ruby.so
RENAME cqpid.so
DESTINATION ${RUBY_PFX_ARCH_DIR}
-@@ -59,7 +60,8 @@ else()
+@@ -65,7 +66,8 @@ else()
DESTINATION ${RUBY_PFX_ARCH_DIR}
COMPONENT ${QPID_COMPONENT_CLIENT}
)
@@ -79,5 +57,5 @@ index a56fac7..ec12f00 100644
add_custom_command(OUTPUT ${GEM_BINDINGS_SOURCE_FILE}
COMMAND cp ${swig_generated_file_fullname} ${GEM_BINDINGS_SOURCE_FILE}
--
-1.9.0
+1.9.3
diff --git a/qpid-qmf.spec b/qpid-qmf.spec
index af00ad9..71b668c 100644
--- a/qpid-qmf.spec
+++ b/qpid-qmf.spec
@@ -8,20 +8,15 @@
%global __provides_exclude_from ^(%{python_sitearch}/.*\\.so|%{_libdir}/.libqmf*)$
Name: qpid-qmf
-Version: 0.24
+Version: 0.28
Release: 21%{?dist}
Summary: The QPID Management Framework
License: ASL 2.0
URL: http://qpid.apache.org
Source0: http://www.apache.org/dist/qpid/%{version}/qpid-%{version}.tar.gz
-Patch00: 00-QPID-5273-Fixed-installing-the-qmfgen-Python-package.patch
-Patch01: 01-NO-JIRA-Add-explicit-language-references-to-all-sheb.patch
-Patch02: 02-QPID-5499-Fix-Ruby-Perl-bindings-when-built-with-Wer.patch
-Patch03: 03-QPID-5499-Perl-changes-for-format-security.patch
-Patch04: 04-QPID-5656-Updated-Ruby-bindings-to-build-under-CMake.patch
-Patch05: 05-QPID-5718-Dead-code-in-the-HA-codebase.patch
-Patch06: 06-NO-JIRA-Remove-dead-code.patch
+Patch0001: 0001-NO-JIRA-Remove-unused-code.patch
+Patch0002: 0002-QPID-5656-Updated-Ruby-bindings-to-build-under-CMake.patch
BuildRequires: cmake
BuildRequires: swig
@@ -55,10 +50,7 @@ components.
%files devel
%{_includedir}/qmf
-%{_libdir}/libqmf.so
%{_libdir}/libqmf2.so
-%{_libdir}/libqmfengine.so
-%{_libdir}/libqmfconsole.so
%{_bindir}/qmf-gen
%{python_sitelib}/qmfgen
%{_libdir}/pkgconfig/qmf2.pc
@@ -82,11 +74,6 @@ for python.
%files -n python-qpid-qmf
%{python_sitelib}/qpidtoollibs
%{python_sitearch}/qmf
-%{python_sitearch}/cqpid.py*
-%{python_sitearch}/_cqpid.so
-%{python_sitearch}/qmf.py*
-%{python_sitearch}/qmfengine.py*
-%{python_sitearch}/_qmfengine.so
%{python_sitearch}/qmf2.py*
%{python_sitearch}/cqmf2.py*
%{python_sitearch}/_cqmf2.so
@@ -108,9 +95,8 @@ An extensible management framework layered on QPID messaging, bindings
for ruby.
%files -n ruby-qpid-qmf
-%{ruby_vendorlibdir}/qmf.rb
+#%{ruby_vendorlibdir}/qmf.rb
%{ruby_vendorlibdir}/qmf2.rb
-%{ruby_vendorarchdir}/qmfengine.so
%{ruby_vendorarchdir}/cqpid.so
%{ruby_vendorarchdir}/cqmf2.so
@@ -121,10 +107,7 @@ for ruby.
%files -n qpid-qmf
%{_bindir}/qmf-tool
-%{_libdir}/libqmf.so.*
%{_libdir}/libqmf2.so.*
-%{_libdir}/libqmfengine.so.*
-%{_libdir}/libqmfconsole.so.*
%doc %{_pkgdocdir}
%post -n qpid-qmf -p /sbin/ldconfig
@@ -136,13 +119,8 @@ for ruby.
%prep
%setup -q -n qpid-%{version}
-%patch00 -p2
-%patch01 -p2
-%patch02 -p2
-%patch03 -p2
-%patch04 -p2
-%patch05 -p2
-%patch06 -p2
+%patch0001 -p2
+%patch0002 -p2
%global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
@@ -218,6 +196,7 @@ rm -rf %{buildroot}/%{python_sitearch}/mllib
rm -rf %{buildroot}/%{python_sitearch}/qpid
rm -rf %{buildroot}/%{python_sitelib}/*egg-info
rm -rf %{buildroot}/%{python_sitearch}/*egg-info
+rm -rf %{buildroot}/%{python_sitearch}/*qpid_messaging.*
rm -rf %{buildroot}/%{_libdir}/libqpid*
rm -rf %{buildroot}/%{_libdir}/librdmawrap*
rm -rf %{buildroot}/%{_libdir}/qpid
@@ -226,6 +205,7 @@ rm -rf %{buildroot}/%{_pkgdocdir}/api
rm -rf %{buildroot}/%{_mandir}
rm -rf %{buildroot}/%{_datadir}/qpid/examples
rm -rf %{buildroot}/%{_libexecdir}/qpid
+rm -rf %{buildroot}/%{_libdir}/cmake
popd
@@ -240,23 +220,23 @@ install -d %{_builddir}/cpp/managementgen/qmfgen \
install -d %{buildroot}%{ruby_vendorlibdir}
install -d %{buildroot}%{ruby_vendorarchdir}
-install -pm 644 %{_builddir}/qpid-%{version}/cpp/bindings/qmf/ruby/qmf.rb \
- %{buildroot}%{ruby_vendorlibdir}
+#install -pm 644 %{_builddir}/qpid-%{version}/cpp/bindings/qmf/ruby/qmf.rb \
+# %{buildroot}%{ruby_vendorlibdir}
install -pm 644 %{_builddir}/qpid-%{version}/cpp/bindings/qmf2/ruby/qmf2.rb \
%{buildroot}%{ruby_vendorlibdir}
%if 0%{?fedora} > 20
install -pm 755 %{_builddir}/qpid-%{version}/cpp/bindings/qpid/ruby/cqpid_ruby.so \
%{buildroot}%{ruby_vendorarchdir}/cqpid.so
-install -pm 755 %{_builddir}/qpid-%{version}/cpp/bindings/qmf/ruby/qmfengine_ruby.so \
- %{buildroot}%{ruby_vendorarchdir}/qmfengine.so
+#install -pm 755 %{_builddir}/qpid-%{version}/cpp/bindings/qmf/ruby/qmfengine_ruby.so \
+# %{buildroot}%{ruby_vendorarchdir}/qmfengine.so
install -pm 755 %{_builddir}/qpid-%{version}/cpp/bindings/qmf2/ruby/cqmf2_ruby.so \
%{buildroot}%{ruby_vendorarchdir}/cqmf2.so
%else
install -pm 755 %{_builddir}/qpid-%{version}/cpp/bindings/qpid/ruby/libcqpid_ruby.so \
%{buildroot}%{ruby_vendorarchdir}/cqpid.so
-install -pm 755 %{_builddir}/qpid-%{version}/cpp/bindings/qmf/ruby/libqmfengine_ruby.so \
- %{buildroot}%{ruby_vendorarchdir}/qmfengine.so
+#install -pm 755 %{_builddir}/qpid-%{version}/cpp/bindings/qmf/ruby/libqmfengine_ruby.so \
+# %{buildroot}%{ruby_vendorarchdir}/qmfengine.so
install -pm 755 %{_builddir}/qpid-%{version}/cpp/bindings/qmf2/ruby/libcqmf2_ruby.so \
%{buildroot}%{ruby_vendorarchdir}/cqmf2.so
%endif
@@ -267,6 +247,9 @@ rm -rf %{buildroot}/usr/local/%{_lib}/ruby/site_ruby
%changelog
+* Thu Jun 5 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.28-1
+- Rebased on Qpid 0.28.
+
* Mon Jun 2 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.24-21
- Missed the arch reference on one requires.
diff --git a/sources b/sources
index e9a1489..b45c371 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26fff4ce45352b3949d2263ba9434cb0 qpid-0.24.tar.gz
+db0422dc4f17febf9f1039509fd7ad83 qpid-0.28.tar.gz
More information about the scm-commits
mailing list