[qpid-cpp/f16] Fixed building C++ messaging examples.

[Darryl L. Pierce]

commit d56fc9135c427ded6840ea61cdc9af43d9beb5dd
Author: Darryl L. Pierce <dpierce at redhat.com>
Date:   Fri Oct 12 15:59:28 2012 -0400

    Fixed building C++ messaging examples.
    
    - Fixed ownership for /usr/share/qpidc and /usr/shar/qpidc/messaging
    - Resolves: BZ#802791
    - Resolves: BZ#756927

 ...g-of-messaging-examples-after-installatio.patch |   25 ++++++++++++++++++++
 qpid-cpp.spec                                      |   16 +++++++++---
 2 files changed, 37 insertions(+), 4 deletions(-)
---
diff --git a/02-Fix-building-of-messaging-examples-after-installatio.patch b/02-Fix-building-of-messaging-examples-after-installatio.patch
new file mode 100644
index 0000000..7c54e7b
--- /dev/null
+++ b/02-Fix-building-of-messaging-examples-after-installatio.patch
@@ -0,0 +1,25 @@
+From 4dbc0b1e804b5fd07c824c203654b69baf5cb64b Mon Sep 17 00:00:00 2001
+From: "Darryl L. Pierce" <dpierce at redhat.com>
+Date: Fri, 12 Oct 2012 15:46:30 -0400
+Subject: [PATCH] Fix building of messaging examples after installation.
+
+---
+ qpid/cpp/examples/messaging/extra_dist/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qpid/cpp/examples/messaging/extra_dist/Makefile b/qpid/cpp/examples/messaging/extra_dist/Makefile
+index 8dd7f65..33dbfef 100644
+--- a/qpid/cpp/examples/messaging/extra_dist/Makefile
++++ b/qpid/cpp/examples/messaging/extra_dist/Makefile
+@@ -18,7 +18,7 @@
+ #
+ CXX=g++
+ CXXFLAGS=-g -O2
+-LDFLAGS=-lqpidmessaging
++LDFLAGS=-lqpidmessaging -lqpidtypes -lstdc++
+ 
+ all: drain spout client server map_sender map_receiver hello_world
+ 
+-- 
+1.7.11.7
+
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 07be5b1..1a6a474 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -28,12 +28,12 @@
 
 Name:           qpid-cpp
 Version:        0.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Libraries for Qpid C++ client applications
 License:        ASL 2.0
 URL:            http://qpid.apache.org
 
-Source0:        qpid-%{version}.tar.gz
+Source0:        http://www.apache.org/dist/qpid/%{version}/qpid-%{version}.tar.gz
 Source1:        store-%{version}.%{store_svnrev}.tar.gz
 
 BuildRequires: boost-devel
@@ -65,6 +65,8 @@ BuildRequires: db4-devel
 BuildRequires: libaio-devel
 
 Patch1: 01-Relocated-all-swig-.i-files-to-the-include-directory.patch
+Patch2: 02-Fix-building-of-messaging-examples-after-installatio.patch
+
 
 %description
 
@@ -147,8 +149,7 @@ in C++ using Qpid.  Qpid implements the AMQP messaging specification.
 %{_libdir}/libqpidtypes.so
 %{_libdir}/libqpidmessaging.so
 %{_libdir}/pkgconfig/qpid.pc
-%{_datadir}/qpidc/examples/messaging
-%{_datadir}/qpidc/examples/old_api
+%{_datadir}/qpidc
 %defattr(755,root,root,-)
 %{_bindir}/qpid-perftest
 %{_bindir}/qpid-topic-listener
@@ -561,6 +562,7 @@ Management and diagnostic tools for Apache Qpid brokers and clients.
 %setup -q -T -D -b 1 -n qpid-%{version}
 
 %patch1 -p2
+%patch2 -p2
 
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
 
@@ -743,6 +745,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 12 2012 Darryl L. Pierce <dpierce at redhat.com> - 0.18-3
+- Fixed building C++ messaging examples.
+- Fixed ownership for /usr/share/qpidc and /usr/shar/qpidc/messaging
+- Resolves: BZ#802791
+- Resolves: BZ#756927
+
 * Wed Sep 26 2012 Darryl L. Pierce <dpierce at redhat.com> - 0.18-2
 - Removed the perl-qpid subpackage.