[compat-qpid-cpp] Renamed the virtual provides to with project needs.

[Darryl L. Pierce]

commit 1f1452be8a7815fc97959145c795370e68bd4417
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Fri Aug 15 10:18:51 2014 -0400

    Renamed the virtual provides to with project needs.
    
    - Reverted changes introduced in r14 by pbrobinson at gmail.com.

 compat-qpid-cpp.spec |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/compat-qpid-cpp.spec b/compat-qpid-cpp.spec
index 8c9cdba..d296d8e 100644
--- a/compat-qpid-cpp.spec
+++ b/compat-qpid-cpp.spec
@@ -41,7 +41,7 @@ Patch10: 10-QPID-5499-Fix-Ruby-bindings-when-built-with-Werror-f.patch
 Patch11: 11-QPID-5656-Updated-Ruby-bindings-to-build-under-CMake.patch
 Patch12: 12-QPID-5718-Dead-code-in-the-HA-codebase.patch
 Patch13: 13-NO-JIRA-Removed-dead-code.patch
-Patch14: qpid-cpp-aarch64.patch
+# Patch14: qpid-cpp-aarch64.patch
 
 
 BuildRequires: cmake
@@ -62,7 +62,7 @@ BuildRequires: cyrus-sasl
 BuildRequires: boost-program-options
 BuildRequires: boost-filesystem
 BuildRequires: libuuid-devel
-%ifnarch s390 s390x
+%ifnarch s390 s390x %{arm}
 BuildRequires: libibverbs-devel
 BuildRequires: librdmacm-devel
 %endif
@@ -117,7 +117,7 @@ the AMQP protocol.
 %{_libdir}/libqpidmessaging.so.2*
 %dir %{_libdir}/qpid
 
-%ifnarch s390 s390x
+%ifnarch s390 s390x %{arm}
 %{_libdir}/qpid/client
 %exclude %{_libdir}/qpid/client/rdmaconnector.so*
 %endif
@@ -313,7 +313,7 @@ fi
 
 
 
-%ifnarch s390 s390x
+%ifnarch s390 s390x %{arm}
 %package client-rdma
 Conflicts: qpid-cpp-client-rdma
 Provides:  qpid-cpp-client-rdma
@@ -465,7 +465,7 @@ Management and diagnostic tools for Apache Qpid brokers and clients.
 %patch11 -p2
 %patch12 -p2
 %patch13 -p2
-%patch14 -p1
+# %patch14 -p1
 
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
 
@@ -573,10 +573,18 @@ rm -rf %{buildroot}/usr/local/%{_lib}/ruby/site_ruby
 %exclude %{python_sitearch}/qpid
 %exclude %{python_sitearch}/*.egg-info
 
+%ifnarch %{arm}
+# %exclude %{python_sitearch}/qmf
+# %exclude %{ruby_vendorlibdir}/qmf*
+# %exclude %{ruby_vendorarchdir}/cqpid.so
+# %exclude %{ruby_vendorarchdir}/*qmf*
+%endif
+
 
 %changelog
 * Thu Aug 14 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.24-15
 - Renamed the virtual provides to with project needs.
+- Reverted changes introduced in r14 by pbrobinson at gmail.com.
 
 * Sat Jun  7 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.24-14
 - Remove arm conditionals as we now have the dependencies