[qpid-proton/el6: 31/31] Merge branch 'master' into el6

[Darryl L. Pierce]

commit d3fe7d9c6de728fe8bbda47b0da71ddde8e24233
Merge: 8e1eb09 90a0fe8
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Mon Feb 24 16:49:45 2014 -0500

    Merge branch 'master' into el6

 qpid-proton.spec |   73 +++++++++++++++++++++++++++++------------------------
 1 files changed, 40 insertions(+), 33 deletions(-)
---
diff --cc qpid-proton.spec
index 601b4eb,60bd363..d7cf2b1
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@@ -53,14 -63,14 +63,13 @@@ Provides:  qpid-proton = %{version}-%{r
  %{_libdir}/libqpid-proton.so.*
  
  
- %post -n qpid-proton-c -p /sbin/ldconfig
- 
- 
- %postun -n qpid-proton-c -p /sbin/ldconfig
+ %post c -p /sbin/ldconfig
  
 -
+ %postun c -p /sbin/ldconfig
  
+ # === qpid-proton-c-devel
  
- %package -n qpid-proton-c-devel
+ %package c-devel
  Requires:  qpid-proton-c%{?_isa} = %{version}-%{release}
  Summary:   Development libraries for writing messaging apps with Qpid Proton
  Obsoletes: qpid-proton-devel < %{version}-%{release}
@@@ -110,8 -120,10 +119,8 @@@ Requires: pytho
  %{python_sitearch}/cproton.*
  %{python_sitearch}/proton.*
  
- 
+ # === python-qpid-proton-doc
  
 -
 -
  %package -n python-qpid-proton-doc
  Summary:   Documentation for the Python language bindings for Qpid Proton
  BuildArch: noarch
@@@ -130,8 -142,10 +139,9 @@@
  
  %patch1 -p1
  
 -
  %build
- %cmake28 \
+ 
+ %cmake_exe \
      -DPROTON_DISABLE_RPATH=true \
      -DPYTHON_ARCHLIB_DIR=%{python_sitearch} \
      .