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

[Peter Robinson]

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

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

 .gitignore             |   20 +-------------------
 qpid-cpp-aarch64.patch |   11 +++++++++++
 qpid-cpp.spec          |   30 ++++++++++++++++++------------
 3 files changed, 30 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6afc101..3772253 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1 @@
-qpid-cpp-0.7.946106.tar.gz
-store-0.7.3975.tar.gz
-/qpid-0.8.tar.gz
-/store-0.8.4411.tar.gz
-/store-0.10.4446.tar.gz
-/qpid-0.10.tar.gz
-/qpid-0.16.tar.gz
-/store-0.16.4509.tar.gz
-/qpid-0.18.tar.gz
-/store-0.18.4512.tar.gz
-/qpid-0.20.tar.gz
-/store-0.20.4521.tar.gz
-/qpid-0.22.tar.gz
-/store-0.22.4521.tar.gz
-/qpid-cpp-0.22.tgz
-/qpid-cpp-0.22.tar.gz
-/qpid-0.24.tar.gz
-/qpid-0.26.tar.gz
-/qpid-0.28.tar.gz
+/qpid-0.*.tar.gz
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 */
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index f56d5f6..d079896 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -1,16 +1,17 @@
 # Define pkgdocdir for releases that don't define it already
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
-Name:          qpid-cpp
-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
+Name:      qpid-cpp
+Version:   0.28
+Release:   2%{?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
 Patch0001: 0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
 Patch0002: 0002-NO-JIRA-Remove-unused-code.patch
+Patch0003: qpid-cpp-aarch64.patch
 
 BuildRequires: gcc-c++
 BuildRequires: cmake
@@ -36,7 +37,7 @@ BuildRequires: qpid-proton-c-devel%{?_isa} >= 0.5
 BuildRequires: libdb-devel
 BuildRequires: libdb4-cxx-devel
 
-%ifnarch s390 s390x %{arm}
+%ifnarch s390 s390x
 BuildRequires: libibverbs-devel
 BuildRequires: librdmacm-devel
 %endif
@@ -81,11 +82,11 @@ the AMQP protocol.
 %{_libdir}/libqpidmessaging.so*
 %dir %{_libdir}/qpid
 
-%ifnarch s390 s390x %{arm}
+%ifnarch s390 s390x
 %{_libdir}/qpid/client/*
 %endif
 
-%ifnarch s390 s390x %{arm}
+%ifnarch s390 s390x
 %exclude %{_libdir}/qpid/client/rdmaconnector.so*
 %endif
 
@@ -249,7 +250,7 @@ Requires(postun): systemd-units
 
 # === qpid-cpp-client-rdma
 
-%ifnarch s390 s390x %{arm}
+%ifnarch s390 s390x
 %package client-rdma
 Summary:  RDMA Protocol support (including Infiniband) for Qpid clients
 
@@ -388,6 +389,7 @@ Management and diagnostic tools for Apache Qpid brokers and clients.
 
 %patch0001 -p2
 %patch0002 -p2
+%patch0003 -p1
 
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
 
@@ -483,6 +485,10 @@ rm -rf %{buildroot}/usr/local/%{_lib}/ruby/site_ruby
 
 
 %changelog
+* Sat Jun  7 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.28-2
+- Remove arm conditionals as we now have the dependencies
+- Fix aarch64 defines (it's not arm64)
+
 * Wed Jun  4 2014 Darryl L. Pierce <dpierce at redhat.com> - 0.28-1
 - Rebased on Qpid 0.28.