[qpid-cpp/f18] Moved the Qpidd swig descriptors to /usr/include/qpid

[Darryl L. Pierce]

commit c9eda053154a149606901588daed7b46d3f789db
Author: Darryl L. Pierce <dpierce at redhat.com>
Date:   Thu Feb 14 14:44:48 2013 -0500

    Moved the Qpidd swig descriptors to /usr/include/qpid
    
    - Moved the QMF swig descriptors to /usr/include/qmf

 qpid-cpp.spec |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index ddfe124..7dab3f0 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -30,7 +30,7 @@
 
 Name:           qpid-cpp
 Version:        0.20
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 License:        ASL 2.0
 URL:            http://qpid.apache.org
@@ -133,10 +133,10 @@ in C++ using Qpid.  Qpid implements the AMQP messaging specification.
 %defattr(-,root,root,-)
 %dir %{_includedir}/qpid
 %{_includedir}/qpid/*.h
-%{_includedir}/qpid.i
-%{_includedir}/swig_perl_typemaps.i
-%{_includedir}/swig_python_typemaps.i
-%{_includedir}/swig_ruby_typemaps.i
+%{_includedir}/qpid/qpid.i
+%{_includedir}/qpid/swig_perl_typemaps.i
+%{_includedir}/qpid/swig_python_typemaps.i
+%{_includedir}/qpid/swig_ruby_typemaps.i
 %{_includedir}/qpid/amqp_0_10
 %{_includedir}/qpid/client
 %{_includedir}/qpid/console
@@ -320,8 +320,8 @@ components.
 %{_libdir}/libqmf2.so
 %{_libdir}/libqmfengine.so
 %{_libdir}/libqmfconsole.so
-%{_includedir}/qmfengine.i
-%{_includedir}/qmf2.i
+%{_includedir}/qmf/qmfengine.i
+%{_includedir}/qmf/qmf2.i
 %{_bindir}/qmf-gen
 %{python_sitelib}/qmfgen
 %{_libdir}/pkgconfig/qmf2.pc
@@ -742,12 +742,15 @@ popd
 
 # install swig definition files
 pushd %{_builddir}/qpid-%{version}
-install -p -m 644 cpp/bindings/qpid/qpid.i %{buildroot}%{_includedir}
-install -p -m 644 cpp/bindings/qmf/qmfengine.i %{buildroot}%{_includedir}
-install -p -m 644 cpp/bindings/qmf2/qmf2.i %{buildroot}%{_includedir}
-install -p -m 644 cpp/bindings/swig_perl_typemaps.i %{buildroot}%{_includedir}
-install -p -m 644 cpp/bindings/swig_python_typemaps.i %{buildroot}%{_includedir}
-install -p -m 644 cpp/bindings/swig_ruby_typemaps.i %{buildroot}%{_includedir}
+mkdir -p -m0755 %{buildroot}%{_includedir}/qpid
+mkdir -p -m0755 %{buildroot}%{_includedir}/qmf
+
+install -p -m 644 cpp/bindings/qpid/qpid.i %{buildroot}%{_includedir}/qpid
+install -p -m 644 cpp/bindings/qmf/qmfengine.i %{buildroot}%{_includedir}/qmf
+install -p -m 644 cpp/bindings/qmf2/qmf2.i %{buildroot}%{_includedir}/qmf
+install -p -m 644 cpp/bindings/swig_perl_typemaps.i %{buildroot}%{_includedir}/qpid
+install -p -m 644 cpp/bindings/swig_python_typemaps.i %{buildroot}%{_includedir}/qpid
+install -p -m 644 cpp/bindings/swig_ruby_typemaps.i %{buildroot}%{_includedir}/qpid
 popd
 
 %clean
@@ -764,6 +767,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Feb 14 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.20-3
+- Moved the Qpidd swig descriptors to /usr/include/qpid
+- Moved the QMF swig descriptors to /usr/include/qmf
+
 * Mon Jan 28 2013 Darryl L. Pierce <dpierce at redhat.com> - 0.20-2
 - Fixed memory leak in Perl bindings typemap.
 - Resolves: BZ#885149