[qpid-cpp/f14] Rebased to sync with upstream's official 0.10 release
Nuno Santos
nsantos at fedoraproject.org
Thu May 12 13:20:41 UTC 2011
commit b7164cedb7fcd3a833ae17c4e7434572fca36c36
Author: Nuno Santos <nsantos at redhat.com>
Date: Tue May 10 13:12:56 2011 -0400
Rebased to sync with upstream's official 0.10 release
mutable.patch | 13 +++++
qpid-3159.patch | 29 ++++++++++++
qpid-cpp.spec | 138 +++++++++++++++++++++++++++++++++++--------------------
sources | 4 +-
4 files changed, 132 insertions(+), 52 deletions(-)
---
diff --git a/mutable.patch b/mutable.patch
new file mode 100644
index 0000000..a9c85c3
--- /dev/null
+++ b/mutable.patch
@@ -0,0 +1,13 @@
+Index: cpp/src/qmf/Agent.cppIndex: cpp/src/qpid/framing/SendContent.h
+===================================================================
+--- cpp/src/qpid/framing/SendContent.h 2009-03-12 16:55:34.000000000 -0400
++++ cpp/src/qpid/framing/SendContent.h 2011-02-07 16:12:01.949172798 -0500
+@@ -37,7 +37,7 @@
+ */
+ class SendContent
+ {
+- mutable FrameHandler& handler;
++ FrameHandler& handler;
+ const uint16_t maxFrameSize;
+ uint expectedFrameCount;
+ uint frameCount;
diff --git a/qpid-3159.patch b/qpid-3159.patch
new file mode 100644
index 0000000..c510cf5
--- /dev/null
+++ b/qpid-3159.patch
@@ -0,0 +1,29 @@
+From c26786f952a8bf80eb8c836bc616f559b9fd2e3f Mon Sep 17 00:00:00 2001
+From: Ted Ross <tross at apache.org>
+Date: Tue, 22 Mar 2011 21:39:31 +0000
+Subject: [PATCH] QPID-3159 - Applied patch from Angus Salkeld
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1084359 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/cpp/managementgen/qmfgen/schema.py | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/qpid/cpp/managementgen/qmfgen/schema.py b/qpid/cpp/managementgen/qmfgen/schema.py
+index afdfe42..59e951f 100755
+--- a/qpid/cpp/managementgen/qmfgen/schema.py
++++ b/qpid/cpp/managementgen/qmfgen/schema.py
+@@ -1731,9 +1731,9 @@ class SchemaPackage:
+ stream.write(" qmf::SchemaProperty arg(\"%s\", %s);\n" % (arg.name, typeName))
+ if subType:
+ stream.write(" arg.setSubtype(\"%s\");\n" % subType)
+- if stat.unit:
++ if arg.unit:
+ stream.write(" arg.setUnit(\"%s\");\n" % arg.unit)
+- if stat.desc:
++ if arg.desc:
+ stream.write(" arg.setDesc(\"%s\");\n" % arg.desc)
+ stream.write(" arg.setDirection(%s);\n" % self.qmfv2Dir(arg.dir))
+ stream.write(" method.addArgument(arg);\n")
+--
+1.6.2.5
+
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index d77b2e9..9dd2b5f 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -22,11 +22,11 @@
%global MRG_non_core 1
# Release numbers
-%global qpid_release 0.8
-%global qpid_svnrev 1037942
-%global store_svnrev 4411
+%global qpid_release 0.10
+%global qpid_svnrev 1091571
+%global store_svnrev 4446
# Change this release number for each build of the same qpid_svnrev, otherwise set back to 1.
-%global release_num 4
+%global release_num 2
# NOTE: these flags should not both be set at the same time!
# RHEL-6 builds should have all flags set to 0.
@@ -38,15 +38,17 @@
%global rhel_5 0
# LIBRARY VERSIONS
-%global QPIDCOMMON_VERSION_INFO 3:0:0
-%global QPIDBROKER_VERSION_INFO 3:0:0
-%global QPIDCLIENT_VERSION_INFO 3:0:0
-%global QPIDMESSAGING_VERSION_INFO 3:0:0
-%global QMF_VERSION_INFO 2:0:0
-%global QMFENGINE_VERSION_INFO 2:0:0
-%global QMFCONSOLE_VERSION_INFO 3:0:0
-%global RDMAWRAP_VERSION_INFO 3:0:0
-%global SSLCOMMON_VERSION_INFO 3:0:0
+%global QPIDCOMMON_VERSION_INFO 5:0:0
+%global QPIDTYPES_VERSION_INFO 3:0:2
+%global QPIDBROKER_VERSION_INFO 5:0:0
+%global QPIDCLIENT_VERSION_INFO 5:0:0
+%global QPIDMESSAGING_VERSION_INFO 4:0:1
+%global QMF_VERSION_INFO 4:0:0
+%global QMF2_VERSION_INFO 1:0:0
+%global QMFENGINE_VERSION_INFO 4:0:0
+%global QMFCONSOLE_VERSION_INFO 5:0:0
+%global RDMAWRAP_VERSION_INFO 5:0:0
+%global SSLCOMMON_VERSION_INFO 5:0:0
# Single var with all lib version params (except store) for make
%global LIB_VERSION_MAKE_PARAMS QPIDCOMMON_VERSION_INFO=%{QPIDCOMMON_VERSION_INFO} QPIDBROKER_VERSION_INFO=%{QPIDBROKER_VERSION_INFO} QPIDCLIENT_VERSION_INFO=%{QPIDCLIENT_VERSION_INFO} QPIDMESSAGING_VERSION_INFO=%{QPIDMESSAGING_VERSION_INFO} QMF_VERSION_INFO=%{QMF_VERSION_INFO} QMFENGINE_VERSION_INFO=%{QMFENGINE_VERSION_INFO} QMFCONSOLE_VERSION_INFO=%{QMFCONSOLE_VERSION_INFO} RDMAWRAP_VERSION_INFO=%{RDMAWRAP_VERSION_INFO} SSLCOMMON_VERSION_INFO=%{SSLCOMMON_VERSION_INFO}
@@ -101,12 +103,12 @@ URL: http://qpid.apache.org
Source0: qpid-%{version}.tar.gz
Source1: store-%{qpid_release}.%{store_svnrev}.tar.gz
-Patch0: bootstrap.patch
Patch1: store-4411.patch
%if %{fedora}
-Patch2: fedora.patch
+Patch2: qpid-3159.patch
Patch6: boost_filesystem_v2.patch
+Patch7: mutable.patch
%endif
%if %{rhel_4}
@@ -258,6 +260,7 @@ in C++ using Qpid. Qpid implements the AMQP messaging specification.
%_libdir/libqpidmessaging.so
%if ! %{rhel_4}
%_datadir/qpidc/examples/messaging
+%_datadir/qpidc/examples/old_api
%endif
%defattr(755,root,root,-)
%_bindir/qpid-perftest
@@ -331,7 +334,7 @@ the open AMQP messaging protocol.
%_libdir/qpid/daemon/acl.so
%attr(755, qpidd, qpidd) %_localstatedir/lib/qpidd
%ghost %attr(755, qpidd, qpidd) /var/run/qpidd
-%attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb
+#%attr(600, qpidd, qpidd) %config(noreplace) %_localstatedir/lib/qpidd/qpidd.sasldb
%doc %_mandir/man1/qpidd.*
%pre -n %{pkg_name}-server
@@ -395,48 +398,52 @@ Qpid broker daemon.
%endif
-# === Package: qmf ===
+# === Package: qpid-qmf ===
%if %{qmf}
-%package -n qmf
+%package -n qpid-qmf
Summary: The QPID Management Framework
Group: System Environment/Daemons
Requires: %{pkg_name}-client = %version-%release
+Provides: qmf = %version-%release
+Obsoletes: qmf < %version-%release
-%description -n qmf
+%description -n qpid-qmf
An extensible management framework layered on QPID messaging.
-%files -n qmf
+%files -n qpid-qmf
%defattr(-,root,root,-)
%_libdir/libqmf.so.*
%_libdir/libqmf2.so.*
%_libdir/libqmfengine.so.*
%_libdir/libqmfconsole.so.*
-%post -n qmf
+%post -n qpid-qmf
/sbin/ldconfig
-%postun -n qmf
+%postun -n qpid-qmf
/sbin/ldconfig
%endif
-# === Package: qmf-devel ===
+# === Package: qpid-qmf-devel ===
%if %{qmf_devel}
-%package -n qmf-devel
+%package -n qpid-qmf-devel
Summary: Header files and tools for developing QMF extensions
Group: Development/System
-Requires: qmf = %version-%release
+Requires: qpid-qmf = %version-%release
Requires: %{pkg_name}-client-devel = %version-%release
+Provides: qmf-devel = %version-%release
+Obsoletes: qmf-devel < %version-%release
-%description -n qmf-devel
+%description -n qpid-qmf-devel
Header files and code-generation tools needed for developers of QMF-managed
components.
-%files -n qmf-devel
+%files -n qpid-qmf-devel
%defattr(-,root,root,-)
%_libdir/libqmf.so
%_libdir/libqmf2.so
@@ -445,29 +452,32 @@ components.
%_bindir/qmf-gen
%{python_sitelib}/qmfgen
-%post -n qmf-devel
+%post -n qpid-qmf-devel
/sbin/ldconfig
-%postun -n qmf-devel
+%postun -n qpid-qmf-devel
/sbin/ldconfig
%endif
-# === Package: python-qmf ===
+# === Package: python-qpid-qmf ===
%if %{python_qmf} && ! %{rhel_4}
-%package -n python-qmf
+%package -n python-qpid-qmf
Summary: The QPID Management Framework bindings for python
Group: System Environment/Libraries
-Requires: qmf = %version-%release
+Requires: qpid-qmf = %version-%release
+Provides: python-qmf = %version-%release
+Obsoletes: python-qmf < %version-%release
-%description -n python-qmf
+%description -n python-qpid-qmf
An extensible management framework layered on QPID messaging, bindings
for python.
-%files -n python-qmf
+%files -n python-qpid-qmf
%defattr(-,root,root,-)
+%{python_sitelib}/qmf
%{python_sitelib}/cqpid.py*
%{python_sitelib}/_cqpid.so
%{python_sitelib}/qmf.py*
@@ -476,29 +486,35 @@ for python.
%{python_sitelib}/qmf2.py*
%{python_sitelib}/cqmf2.py*
%{python_sitelib}/_cqmf2.so
+%{_bindir}/qpid-python-test
+%exclude %{python_sitelib}/mllib
+%exclude %{python_sitelib}/qpid
+%exclude %{python_sitelib}/*.egg-info
-%post -n python-qmf
+%post -n python-qpid-qmf
/sbin/ldconfig
-%postun -n python-qmf
+%postun -n python-qpid-qmf
/sbin/ldconfig
%endif
-# === Package: ruby-qmf ===
+# === Package: ruby-qpid-qmf ===
%if %{ruby_qmf} && ! %{rhel_4}
-%package -n ruby-qmf
+%package -n ruby-qpid-qmf
Summary: The QPID Management Framework bindings for ruby
Group: System Environment/Libraries
-Requires: qmf = %version-%release
+Requires: qpid-qmf = %version-%release
+Provides: ruby-qmf = %version-%release
+Obsoletes: ruby-qmf < %version-%release
-%description -n ruby-qmf
+%description -n ruby-qpid-qmf
An extensible management framework layered on QPID messaging, bindings
for ruby.
-%files -n ruby-qmf
+%files -n ruby-qpid-qmf
%defattr(-,root,root,-)
%{ruby_sitelib}/qmf.rb
%{ruby_sitelib}/qmf2.rb
@@ -506,10 +522,10 @@ for ruby.
%{ruby_sitearch}/cqpid.so
%{ruby_sitearch}/cqmf2.so
-%post -n ruby-qmf
+%post -n ruby-qpid-qmf
/sbin/ldconfig
-%postun -n ruby-qmf
+%postun -n ruby-qpid-qmf
/sbin/ldconfig
%endif
@@ -810,16 +826,15 @@ popd
%patch5
%endif
-%patch0
-
%if %{fedora}
-%patch2
-%patch6
+%patch2 -p2
+###%patch6
+%patch7
%endif
# apply store patch
pushd ../store-%{qpid_release}.%{store_svnrev}
-%patch1
+###%patch1
popd
%global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
@@ -838,7 +853,7 @@ CXXFLAGS="%{optflags} -DNDEBUG -O3" \
CXXFLAGS="%{optflags} -DNDEBUG -O3" \
%configure --disable-static --with-cpg --without-graphviz --without-help2man --with-swig
%endif
-ECHO=echo make %{LIB_VERSION_MAKE_PARAMS}
+ECHO=echo make %{LIB_VERSION_MAKE_PARAMS} %{?_smp_mflags}
# Make perftest utilities
pushd src/tests
@@ -884,12 +899,16 @@ export CXXFLAGS="%{optflags} -DNDEBUG"
%endif
./bootstrap
%configure --disable-static --disable-rpath --disable-dependency-tracking --with-qpid-checkout=%{_builddir}/qpid-%{version}
-make
+make %{?_smp_mflags}
popd
%install
rm -rf %{buildroot}
mkdir -p -m0755 %{buildroot}/%_bindir
+
+(cd python; %{__python} setup.py install --skip-build --root %{buildroot})
+(cd extras/qmf; %{__python} setup.py install --skip-build --root %{buildroot})
+
pushd %{_builddir}/qpid-%{version}/cpp
make install DESTDIR=%{buildroot}
@@ -939,6 +958,7 @@ rm -f %{buildroot}%_libdir/librdmawrap.so
rm -f %{buildroot}%_libdir/libsslcommon.so
rm -f %{buildroot}%_libdir/qpid/client/*.la
rm -f %{buildroot}%_libdir/qpid/daemon/*.la
+rm -f %{buildroot}%_libdir/libcqpid_perl.so
# this should be fixed in the examples Makefile (make install)
rm -f %{buildroot}%_datadir/qpidc/examples/Makefile
@@ -1105,6 +1125,24 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
%changelog
+* Mon May 2 2011 Nuno Santos <nsantos at redhat.com> - 0.10-1
+- Rebased to sync with upstream's official 0.10 release
+
+* Sun Apr 17 2011 Kalev Lember <kalev at smartlink.ee> - 0.8-8
+- Rebuilt for boost 1.46.1 soname bump
+
+* Thu Mar 10 2011 Kalev Lember <kalev at smartlink.ee> - 0.8-7
+- Rebuilt with xerces-c 3.1
+
+* Tue Feb 22 2011 Nuno Santos <nsantos at redhat.com> - 0.8-6
+- BZ661736 - renaming qmf subpackage to qpid-qmf
+
+* Mon Feb 14 2011 Nuno Santos <nsantos at redhat.com> - 0.8-5
+- Updated qmf patch
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-4.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Mon Feb 7 2011 Nuno Santos <nsantos at redhat.com> - 0.8-4
- BZ671520 - SELinux is preventing /usr/bin/updatedb from 'getattr' accesses on the directory /var/run/qpidd
diff --git a/sources b/sources
index 0e150fa..bac7d79 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-261c37dc90a1a05b59100476ac9c2839 store-0.8.4411.tar.gz
-0184fef44ae9ca859bb4ef9ee22d5e1c qpid-0.8.tar.gz
+7b0e4a9a0a3e9681685ffec4bac64d16 store-0.10.4446.tar.gz
+75f7e1076fddc08baaee386f9af61897 qpid-0.10.tar.gz
More information about the scm-commits
mailing list