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

[Darryl L. Pierce]

commit ef4335ac2533be4bf5b4fe1512a82e78265c6bac
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                                      |   15 ++++++++---
 2 files changed, 36 insertions(+), 4 deletions(-)
---
diff --git a/04-Fix-building-of-messaging-examples-after-installatio.patch b/04-Fix-building-of-messaging-examples-after-installatio.patch
new file mode 100644
index 0000000..7c54e7b
--- /dev/null
+++ b/04-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 a6a541b..0072c09 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -30,12 +30,12 @@
 
 Name:           qpid-cpp
 Version:        0.18
-Release:        3.2%{?dist}
+Release:        4%{?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
@@ -72,6 +72,7 @@ Patch2: 02-Relocated-all-swig-.i-files-to-the-include-directory.patch
 Patch3: 03-Fixed-db4-on-Fedora.patch
 Patch4: 04-Fix-boost-filesystem-for-1.50.patch
 Patch5: 05-Provides-systemd-support-to-qpidd.patch
+Patch6: 04-Fix-building-of-messaging-examples-after-installatio.patch
 
 %description
 
@@ -154,8 +155,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
@@ -577,6 +577,7 @@ Management and diagnostic tools for Apache Qpid brokers and clients.
 %patch2 -p2
 %patch4 -p2
 %patch5 -p2
+%patch6 -p2
 
 # qpid-store
 pushd ../store-%{version}.%{store_svnrev}
@@ -769,6 +770,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Oct 13 2012 Darryl L. Pierce <dpierce at redhat.com> - 0.18-4
+- Fixed building C++ messaging examples.
+- Fixed ownership for /usr/share/qpidc and /usr/shar/qpidc/messaging
+- Resolves: BZ#802791
+- Resolves: BZ#756927
+
 * Wed Oct 10 2012 Darryl L. Pierce <dpierce at redhat.com> - 0.18-3.2
 - Fixed reference to systemctl.
 - Resolves: BZ#864987