[qpid-qmf/f20] Rebased on Qpid 0.26.

[Darryl L. Pierce]

commit 71536da3f218d66223fe8f29ae9f7bf9e02eb28c
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Fri Jun 13 07:56:30 2014 -0400

    Rebased on Qpid 0.26.

 .gitignore    |    1 +
 qpid-qmf.spec |   40 ++++++----------------------------------
 sources       |    2 +-
 3 files changed, 8 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f1a6f32..8bd3946 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qpid-0.24.tar.gz
+/qpid-0.26.tar.gz
diff --git a/qpid-qmf.spec b/qpid-qmf.spec
index af00ad9..ceb8979 100644
--- a/qpid-qmf.spec
+++ b/qpid-qmf.spec
@@ -8,20 +8,13 @@
 %global __provides_exclude_from ^(%{python_sitearch}/.*\\.so|%{_libdir}/.libqmf*)$
 
 Name:    qpid-qmf
-Version: 0.24
-Release: 21%{?dist}
+Version: 0.26
+Release: 1%{?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
 
 BuildRequires: cmake
 BuildRequires: swig
@@ -55,10 +48,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 +72,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 +93,7 @@ An extensible management framework layered on QPID messaging, bindings
 for ruby.
 
 %files -n ruby-qpid-qmf
-%{ruby_vendorlibdir}/qmf.rb
 %{ruby_vendorlibdir}/qmf2.rb
-%{ruby_vendorarchdir}/qmfengine.so
 %{ruby_vendorarchdir}/cqpid.so
 %{ruby_vendorarchdir}/cqmf2.so
 
@@ -121,10 +104,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,14 +116,6 @@ for ruby.
 %prep
 %setup -q -n qpid-%{version}
 
-%patch00 -p2
-%patch01 -p2
-%patch02 -p2
-%patch03 -p2
-%patch04 -p2
-%patch05 -p2
-%patch06 -p2
-
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
 
 %global rh_qpid_tests_failover "failover_soak run_failover_soak"
@@ -218,6 +190,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
@@ -240,8 +213,6 @@ 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/qmf2/ruby/qmf2.rb \
     %{buildroot}%{ruby_vendorlibdir}
 
@@ -255,8 +226,6 @@ install -pm 755 %{_builddir}/qpid-%{version}/cpp/bindings/qmf2/ruby/cqmf2_ruby.s
 %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/qmf2/ruby/libcqmf2_ruby.so \
     %{buildroot}%{ruby_vendorarchdir}/cqmf2.so
 %endif
@@ -267,6 +236,9 @@ rm -rf %{buildroot}/usr/local/%{_lib}/ruby/site_ruby
 
 
 %changelog
+* Thu Jun 12 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.26-1
+- Rebased on Qpid 0.26.
+
 * 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..b6d19fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-26fff4ce45352b3949d2263ba9434cb0  qpid-0.24.tar.gz
+31c4a058654c91f28ad6bfdcb0e7371e  qpid-0.26.tar.gz