[compat-qpid-cpp] Remove arm conditionals as we now have the dependencies, Fix aarch64 defines (it's not arm64)

[Peter Robinson]

commit 7c356fa6282f10837394efc97bee4e5f2f24212c
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Jun 7 13:11:33 2014 +0100

    Remove arm conditionals as we now have the dependencies, Fix aarch64 defines (it's not arm64)

 .gitignore             |    2 +-
 compat-qpid-cpp.spec   |   21 +-
 compat-qpid-cpp.spec~  |  585 ------------------------------------------------
 qpid-cpp-aarch64.patch |   11 +
 4 files changed, 22 insertions(+), 597 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f1a6f32..3772253 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/qpid-0.24.tar.gz
+/qpid-0.*.tar.gz
diff --git a/compat-qpid-cpp.spec b/compat-qpid-cpp.spec
index 049edb5..b4ef2b8 100644
--- a/compat-qpid-cpp.spec
+++ b/compat-qpid-cpp.spec
@@ -21,7 +21,7 @@
 
 Name:          compat-qpid-cpp
 Version:       0.24
-Release:       13%{?dist}
+Release:       14%{?dist}
 Summary:       Libraries for Qpid C++ client applications
 License:       ASL 2.0
 URL:           http://qpid.apache.org
@@ -41,6 +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
 
 
 BuildRequires: cmake
@@ -61,7 +62,7 @@ BuildRequires: cyrus-sasl
 BuildRequires: boost-program-options
 BuildRequires: boost-filesystem
 BuildRequires: libuuid-devel
-%ifnarch s390 s390x %{arm}
+%ifnarch s390 s390x
 BuildRequires: libibverbs-devel
 BuildRequires: librdmacm-devel
 %endif
@@ -114,7 +115,7 @@ the AMQP protocol.
 %{_libdir}/libqpidmessaging.so.2*
 %dir %{_libdir}/qpid
 
-%ifnarch s390 s390x %{arm}
+%ifnarch s390 s390x
 %{_libdir}/qpid/client
 %exclude %{_libdir}/qpid/client/rdmaconnector.so*
 %endif
@@ -300,7 +301,7 @@ fi
 
 
 
-%ifnarch s390 s390x %{arm}
+%ifnarch s390 s390x
 %package client-rdma
 Conflicts: qpid-cpp-client-rdma
 Provides:  qpid-cpp-client-rdma
@@ -439,6 +440,7 @@ Management and diagnostic tools for Apache Qpid brokers and clients.
 %patch11 -p2
 %patch12 -p2
 %patch13 -p2
+%patch14 -p1
 
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
 
@@ -546,15 +548,12 @@ 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
+* Sat Jun  7 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.24-14
+- Remove arm conditionals as we now have the dependencies
+- Fix aarch64 defines (it's not arm64)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.24-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/qpid-cpp-aarch64.patch b/qpid-cpp-aarch64.patch
new file mode 100644
index 0000000..b1a4f60
--- /dev/null
+++ b/qpid-cpp-aarch64.patch
@@ -0,0 +1,11 @@
+--- qpid-0.28/cpp/src/qpid/legacystore/jrnl/jcfg.h.orig	2014-06-07 11:55:17.797677146 +0100
++++ qpid-0.28/cpp/src/qpid/legacystore/jrnl/jcfg.h	2014-06-07 11:56:10.759498664 +0100
+@@ -39,7 +39,7 @@
+ #elif defined(__PPC__) || defined(__s390__)  /* big endian, 32 bits */
+ #define JRNL_BIG_ENDIAN
+ #define JRNL_32_BIT
+-#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) || (__arm64__) /* little endian, 64 bits */
++#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) || (__aarch64__) /* little endian, 64 bits */
+ #define JRNL_LITTLE_ENDIAN
+ #define JRNL_64_BIT
+ #elif defined(__powerpc64__) || defined(__s390x__) /* big endian, 64 bits */