[qpid-proton: 14/16] Attempting to fix merge conflicts from master to F20

[Darryl L. Pierce]

commit 32ffeafc9b301f556c5b3850a25e0dfaf0a9ecb6
Merge: e7a02dd 13551be
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Mon Feb 24 15:48:22 2014 -0500

    Attempting to fix merge conflicts from master to F20

 qpid-proton.spec |   55 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 13 deletions(-)
---
diff --cc qpid-proton.spec
index 7cf36a1,52543b7..7e1c9bd
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@@ -78,21 -88,21 +88,35 @@@ Provides:  qpid-proton-devel = %{versio
  %{_libdir}/pkgconfig/libqpid-proton.pc
  %{_datadir}/proton/examples
  
+ # === qpid-proton-c-devel-doc
+ 
+ %package c-devel-doc
+ Summary:   Documentation for the C development libraries for Qpid Proton
+ BuildArch: noarch
+ 
+ %description c-devel-doc
+ %{summary}.
+ 
+ %files c-devel-doc
+ %defattr(-,root,root,-)
+ %doc %{proton_datadir}/docs/api-c
+ 
+ # === python-qpid-proton
  
 +
 +%package -n qpid-proton-c-devel-doc
 +Summary:   Documentation for the C development libraries for Qpid Proton
 +BuildArch: noarch
 +
 +%description -n qpid-proton-c-devel-doc
 +%{summary}.
 +
 +%files -n qpid-proton-c-devel-doc
 +%defattr(-,root,root,-)
 +%doc %{proton_datadir}/docs/api-c
 +
 +
 +
  %package -n python-qpid-proton
  Summary:  Python language bindings for the Qpid Proton messaging framework
  
@@@ -110,8 -120,8 +134,9 @@@ 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