[qpid-cpp: 2/2] merged

[Nuno Santos]

commit ae17b91e8b92d0c9d99ae36533f2da2cf4816673
Merge: 1a4f606 de43a29
Author: Nuno Santos <nsantos at redhat.com>
Date:   Mon Jan 10 17:09:15 2011 -0500

    merged

 qpid-cpp.spec |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
---
diff --cc qpid-cpp.spec
index 3ea69e3,011669f..db89c52
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@@ -101,14 -104,20 +106,17 @@@ Patch2:         fedora.patc
  %endif
  
  %if %{rhel_4}
 -Patch0:         RHEL4_SASL_Conf.patch
 -Patch1:         qpidd.patch
 -Patch2:         bz530364-rhel4.patch
 +Patch3:         RHEL4_SASL_Conf.patch
 +Patch4:         qpidd.patch
 +Patch5:         bz530364-rhel4.patch
  %endif
  
 -Patch5:         mrg_1.3.x.patch
 -Patch6:         store_1.3.x.patch
 -
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  
+ # limit the architectures only in RHEL
+ %if 0%{?rhel}
  ExclusiveArch:  i386 i686 x86_64
+ %endif
  #Vendor:         Red Hat, Inc.
  
  BuildRequires: boost-devel
@@@ -984,9 -954,10 +994,13 @@@ rm -rf %{buildroot
  %postun -p /sbin/ldconfig
  
  %changelog
 +* Mon Jan 10 2011 Nuno Santos <nsantos at redhat.com> - 0.8-1
 +- Rebased to sync with upstream's official 0.8 release, based on svn rev 1037942
 +
+ * Tue Dec 21 2010 Dan Horák <dan[at]danny.cz> - 0.7.946106-4.1
+ - don't build with InfiniBand support on s390(x)
+ - don't limit architectures in Fedora
+ 
  * Mon Nov 29 2010 Nuno Santos <nsantos at redhat.com> - 0.7.946106-4
  - BZ656680 - Update Spec File to use ghost macro on files in /var/run