[qpid-cpp] Rebased to sync with upstream's official 0.14 release

[Nuno Santos]

commit 23a7ec7d9cb9cda44c29887f2c44ea510f5e4062
Author: Nuno Santos <nsantos at redhat.com>
Date:   Thu Feb 16 15:58:24 2012 -0500

    Rebased to sync with upstream's official 0.14 release

 qpid-cpp.spec |    4 ++--
 unistd.patch  |   12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 36975d4..96cbf66 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -110,7 +110,7 @@ Source1:        store-%{qpid_release}.%{store_svnrev}.tar.gz
 
 %if %{fedora}
 Patch0:         configure.patch
-Patch1:         fedora.patch
+Patch1:         unistd.patch
 # Patch fixing a compilation issue related to the usage of a "Boost Singleton"
 # (which is not part of the Boost API, but available as a side effect of
 # Boost.Serialization).
@@ -856,7 +856,7 @@ popd
 
 %if %{fedora}
 %patch0 -p0
-#%patch1 -p2
+%patch1 -p2
 #%patch6 -p1
 %endif
 
diff --git a/unistd.patch b/unistd.patch
new file mode 100644
index 0000000..1c8ba41
--- /dev/null
+++ b/unistd.patch
@@ -0,0 +1,12 @@
+Index: qpid/cpp/src/qpid/sys/posix/Socket.cpp
+===================================================================
+--- a/qpid/cpp/src/qpid/sys/posix/Socket.cpp	(revision 1245117)
++++ b/qpid/cpp/src/qpid/sys/posix/Socket.cpp	(working copy)
+@@ -29,6 +29,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/errno.h>
++#include <unistd.h>
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
+ #include <netdb.h>