[qpid-cpp/f17] Rebased to sync with upstream's official 0.14 release
Nuno Santos
nsantos at fedoraproject.org
Fri Feb 17 19:42:56 UTC 2012
commit bb5fe4824be7539cc27dfea54b58beeab321e8c7
Author: Nuno Santos <nsantos at redhat.com>
Date: Fri Feb 17 14:42:42 2012 -0500
Rebased to sync with upstream's official 0.14 release
qpid-cpp.spec | 82 +++++++++++++++++++++++++++++++++++++++-----------------
sources | 4 +-
store.patch | 10 +++++++
unistd.patch | 64 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 133 insertions(+), 27 deletions(-)
---
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index 351bdb6..a47007b 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -23,11 +23,11 @@
%global MRG_non_core 1
# Release numbers
-%global qpid_release 0.12
-%global qpid_svnrev 1154981
-%global store_svnrev 4463
+%global qpid_release 0.14
+%global qpid_svnrev 1209041
+%global store_svnrev 4494
# Change this release number for each build of the same qpid_svnrev, otherwise set back to 1.
-%global release_num 7
+%global release_num 1
# NOTE: these flags should not both be set at the same time!
# RHEL-6 builds should have all flags set to 0.
@@ -78,7 +78,11 @@
%global client_ssl %{MRG_non_core}
%global server_ssl %{MRG_non_core}
%global server_xml %{MRG_non_core}
+%if %{fedora}
+%global server_cluster 0
+%else
%global server_cluster %{MRG_non_core}
+%endif
%global server_store %{MRG_non_core}
%if %{fedora}
%global rh_tests 0
@@ -106,13 +110,14 @@ 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).
# Upstream ticket (Apache JIRA): https://issues.apache.org/jira/browse/QPID-3638
# Fedora ticket: https://bugzilla.redhat.com/show_bug.cgi?id=761045
Patch6: qpid-cpp-singleton.patch
+Patch7: store.patch
%endif
%if %{rhel_4}
@@ -130,46 +135,51 @@ ExclusiveArch: i386 i686 x86_64
#Vendor: Red Hat, Inc.
BuildRequires: boost-devel
-BuildRequires: doxygen
BuildRequires: libtool
+BuildRequires: doxygen
BuildRequires: pkgconfig
BuildRequires: ruby
BuildRequires: ruby-devel
BuildRequires: python
BuildRequires: python-devel
+BuildRequires: perl
BuildRequires: perl-devel
+BuildRequires: swig
BuildRequires: cyrus-sasl-devel
-%if ! %{rhel_4}
BuildRequires: cyrus-sasl-lib
-%endif
BuildRequires: cyrus-sasl
-%if %{client_rdma} || %{server_rdma}
+%if %{rhel_5}
+BuildRequires: e2fsprogs-devel
+%else
+BuildRequires: boost-program-options
+BuildRequires: boost-filesystem
+BuildRequires: libuuid-devel
+%endif
+
+%if %{client_rdma}
BuildRequires: libibverbs-devel
-%if ! %{rhel_4}
BuildRequires: librdmacm-devel
%endif
-%endif
+
BuildRequires: nss-devel
BuildRequires: nspr-devel
+
+%if %{server_xml}
BuildRequires: xqilla-devel
BuildRequires: xerces-c-devel
-BuildRequires: swig
+%endif
+
BuildRequires: db4-devel
BuildRequires: libaio-devel
-%if %{rhel_4} || %{rhel_5}
-BuildRequires: e2fsprogs-devel
%if %{rhel_5}
BuildRequires: openais-devel
BuildRequires: cman-devel
-%endif
%else
-BuildRequires: boost-program-options
-BuildRequires: boost-filesystem
-BuildRequires: libuuid-devel
-BuildRequires: corosynclib-devel >= 1.0.0-1
-BuildRequires: clusterlib-devel >= 3.0.0-20
+%if %{server_cluster}
+BuildRequires: corosynclib-devel
+BuildRequires: clusterlib-devel
+%endif
%endif
-
%description
@@ -852,6 +862,9 @@ popd
%patch0 -p0
%patch1 -p2
%patch6 -p1
+pushd ../store-%{qpid_release}.%{store_svnrev}
+%patch7 -p1
+popd
%endif
%global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
@@ -863,12 +876,28 @@ popd
%build
pushd cpp
./bootstrap
+
+CXXFLAGS="%{optflags} -DNDEBUG -O3 -Wno-unused-result" \
+%configure --disable-static --with-swig --with-sasl --with-ssl --without-help2man \
%if %{rhel_4}
-CXXFLAGS="%{optflags} -DNDEBUG -O3" \
-%configure --disable-static --without-cpg --without-graphviz --without-help2man --without-rdma
+--without-swig \
%else
-CXXFLAGS="%{optflags} -DNDEBUG -O3 -Wno-unused-result" \
-%configure --disable-static --with-cpg --without-graphviz --without-help2man --with-swig
+--with-swig \
+%endif
+%if %{server_rdma}
+--with-rdma \
+%else
+--without-rdma \
+%endif
+%if %{server_cluster}
+--with-cpg \
+%else
+--without-cpg \
+%endif
+%if %{server_xml}
+--with-xml
+%else
+--without-xml
%endif
ECHO=echo make %{LIB_VERSION_MAKE_PARAMS} %{?_smp_mflags}
@@ -1150,6 +1179,9 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
%changelog
+* Thu Feb 16 2012 Nuno Santos <nsantos at redhat.com> - 0.14-1.1
+- Rebased to sync with upstream's official 0.14 release
+
* Wed Jan 18 2012 Nuno Santos <nsantos at redhat.com> - 0.12-7.1
- Added missing subpackage dependency
diff --git a/sources b/sources
index 8da7c8b..a00b782 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-19eb7a39985aef1574ec2244a22204a4 qpid-0.12.tar.gz
-663a2fffe206ff218264f99000e29db4 store-0.12.4463.tar.gz
+1c110d5207d1e169301647c9132bd1ab qpid-0.14.tar.gz
+cb038166b3201573fd799becc74f32c2 store-0.14.4494.tar.gz
diff --git a/store.patch b/store.patch
new file mode 100644
index 0000000..cb49abd
--- /dev/null
+++ b/store.patch
@@ -0,0 +1,10 @@
+--- store-0.14.4494/lib/jrnl/rrfc.cpp 2012-02-17 09:16:36.622404738 -0500
++++ store-0.14.4494/lib/jrnl/rrfc.cpp 2012-02-17 09:31:32.947715009 -0500
+@@ -35,6 +35,7 @@
+
+ #include <cerrno>
+ #include <fcntl.h>
++#include <unistd.h>
+ #include "jrnl/jerrno.hpp"
+ #include "jrnl/jexception.hpp"
+
diff --git a/unistd.patch b/unistd.patch
new file mode 100644
index 0000000..3e84fad
--- /dev/null
+++ b/unistd.patch
@@ -0,0 +1,64 @@
+Index: qpid/cpp/src/qpid/sys/Shlib.h
+===================================================================
+--- a/qpid/cpp/src/qpid/sys/Shlib.h (revision 1245201)
++++ b/qpid/cpp/src/qpid/sys/Shlib.h (working copy)
+@@ -23,6 +23,7 @@
+ */
+
+ #include "qpid/CommonImportExport.h"
++#include "qpid/sys/IntegerTypes.h"
+ #include <boost/noncopyable.hpp>
+ #include <iostream>
+
+Index: qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp
+===================================================================
+--- a/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp 2011-08-17 18:07:36.000000000 -0400
++++ b/qpid/cpp/src/qpid/sys/posix/SocketAddress.cpp 2012-02-16 16:30:15.311869726 -0500
+@@ -84,8 +84,8 @@
+ uint16_t SocketAddress::getPort(::sockaddr const * const addr)
+ {
+ switch (addr->sa_family) {
+- case AF_INET: return ntohs(((::sockaddr_in*)addr)->sin_port);
+- case AF_INET6: return ntohs(((::sockaddr_in6*)addr)->sin6_port);
++ case AF_INET: return ntohs(((const ::sockaddr_in*)addr)->sin_port);
++ case AF_INET6: return ntohs(((const ::sockaddr_in6*)addr)->sin6_port);
+ default:throw Exception(QPID_MSG("Unexpected socket type"));
+ }
+ }
+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>
+Index: qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp
+===================================================================
+--- a/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp (revision 1245201)
++++ b/qpid/cpp/src/qpid/sys/posix/SystemInfo.cpp (working copy)
+@@ -28,6 +28,7 @@
+ #include <sys/socket.h> // For FreeBSD
+ #include <netinet/in.h> // For FreeBSD
+ #include <ifaddrs.h>
++#include <unistd.h>
+ #include <iostream>
+ #include <fstream>
+ #include <sstream>
+Index: qpid/cpp/src/qmf/Hash.h
+===================================================================
+--- a/qpid/cpp/src/qmf/Hash.h (revision 1245201)
++++ b/qpid/cpp/src/qmf/Hash.h (working copy)
+@@ -29,7 +29,7 @@
+ class Hash {
+ public:
+ Hash();
+- qpid::types::Uuid asUuid() const { return qpid::types::Uuid((unsigned char*) data); }
++ qpid::types::Uuid asUuid() const { return qpid::types::Uuid((const unsigned char*) data); }
+ void update(const char* s, uint32_t len);
+ void update(uint8_t v) { update((char*) &v, sizeof(v)); }
+ void update(uint32_t v) { update((char*) &v, sizeof(v)); }
More information about the scm-commits
mailing list