From cb4567fb5bb734cf48041ea4f8122734221a3aa3 Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Mon, 14 Dec 2009 18:48:49 +0000 Subject: [PATCH 01/32] Import #rhbz 533899 --- .cvsignore | 1 + activemq-cpp-local-texmf.patch | 24 ++++++ activemq-cpp.spec | 145 +++++++++++++++++++++++++++++++++ import.log | 1 + sources | 1 + 5 files changed, 172 insertions(+) create mode 100644 activemq-cpp-local-texmf.patch create mode 100644 activemq-cpp.spec create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index e69de29..7499bc0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +activemq-cpp-2.2.6-src.tar.gz diff --git a/activemq-cpp-local-texmf.patch b/activemq-cpp-local-texmf.patch new file mode 100644 index 0000000..8989a32 --- /dev/null +++ b/activemq-cpp-local-texmf.patch @@ -0,0 +1,24 @@ +diff -uNr activemq-cpp-2.2.6.ORIG/texmf.cnf activemq-cpp-2.2.6/texmf.cnf +--- activemq-cpp-2.2.6.ORIG/texmf.cnf 1970-01-01 01:00:00.000000000 +0100 ++++ activemq-cpp-2.2.6/texmf.cnf 2009-11-07 20:47:00.466113909 +0100 +@@ -0,0 +1,2 @@ ++pool_size = 4000000 ++ +diff -uNr activemq-cpp-2.2.6.ORIG/doxygen-include.am activemq-cpp-2.2.6/doxygen-include.am +--- activemq-cpp-2.2.6.ORIG/doxygen-include.am 2009-01-23 14:56:26.000000000 +0100 ++++ activemq-cpp-2.2.6/doxygen-include.am 2009-11-07 20:52:10.558509912 +0100 +@@ -153,12 +153,12 @@ + rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \ + $(DX_PDFLATEX) refman.tex; \ + $(DX_MAKEINDEX) refman.idx; \ +- $(DX_PDFLATEX) refman.tex; \ ++ TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \ + countdown=5; \ + while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \ + refman.log > /dev/null 2>&1 \ + && test $$countdown -gt 0; do \ +- $(DX_PDFLATEX) refman.tex; \ ++ TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \ + countdown=`expr $$countdown - 1`; \ + done; \ + mv refman.pdf ../@PACKAGE@.pdf diff --git a/activemq-cpp.spec b/activemq-cpp.spec new file mode 100644 index 0000000..208d04e --- /dev/null +++ b/activemq-cpp.spec @@ -0,0 +1,145 @@ +Name: activemq-cpp +Version: 2.2.6 +Release: 5%{?dist} +Summary: C++ implementation of JMS-like messaging client + +Group: Development/Libraries +License: ASL 2.0 +URL: http://activemq.apache.org/cms/ +Source0: http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-%{version}-src.tar.gz +# Some local texmf configuration to increase default pool_size. +Patch1: %{name}-local-texmf.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: doxygen +BuildRequires: graphviz +%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 +BuildRequires: tex(latex) +%else +BuildRequires: tetex-latex +%endif + +BuildRequires: automake >= 1.10 +BuildRequires: autoconf >= 2.60 +BuildRequires: libtool >= 1.5.24 +BuildRequires: apr-util-devel%{?_isa} >= 1.3 +BuildRequires: cppunit-devel%{?_isa} >= 1.10.2 + +%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 +BuildRequires: libuuid-devel%{?_isa} +%else +BuildRequires: e2fsprogs-devel%{?_isa} +%endif + +%description +activemq-cpp is a JMS-like API for C++ for interfacing with Message +Brokers such as Apache ActiveMQ. C++ messaging service helps to make your +C++ client code much neater and easier to follow. To get a better feel for +CMS try the API Reference. +ActiveMQ-CPP is a client only library, a message broker such as Apache +ActiveMQ is still needed for your clients to communicate. + +%package devel +Summary: C++ implementation header files for JMS-like messaging +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig +%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 +Requires: libuuid-devel%{?_isa} +%else +Requires: e2fsprogs-devel%{?_isa} +%endif + + + + +%description devel +activemq-cpp is a JMS-like API for C++ for interfacing with Message +Brokers such as Apache ActiveMQ. C++ messaging service helps to make +your C++ client code much neater and easier to follow. To get a better +feel for CMS try the API Reference. ActiveMQ-CPP is a client only +library, a message broker such as Apache ActiveMQ is still needed +for your clients to communicate. + +%{name}-devel contains development header files. + + +%package doc +Summary: C++ implementation header files for JMS-like messaging +Group: Documentation +%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6 +BuildArch: noarch +%endif + +%description doc +activemq-cpp is a JMS-like API for C++ for interfacing with Message +Brokers such as Apache ActiveMQ. C++ messaging service helps to make +your C++ client code much neater and easier to follow. To get a better +feel for CMS try the API Reference. ActiveMQ-CPP is a client only +library, a message broker such as Apache ActiveMQ is still needed +for your clients to communicate. + +%{name}-doc contains api documentation. + +%prep +%setup -q +%patch1 -p1 + + + +%build +mkdir config +./autogen.sh +# Build pdf(30MB) rather than default html(400MB). +%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf +make %{?_smp_mflags} +make %{?_smp_mflags} doxygen-run +cp -p texmf.cnf doc/latex/texmf.cnf +make %{?_smp_mflags} doxygen-pdf + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la +rm $RPM_BUILD_ROOT/%{_bindir}/example + +%clean +rm -rf $RPM_BUILD_ROOT + +%check +make %{?_smp_mflags} check + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%{_libdir}/lib%{name}.so.* +%doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt + +%files devel +%defattr(-,root,root,-) +%{_libdir}/lib%{name}.so +%{_includedir}/%{name}-%{version} +%{_libdir}/pkgconfig/%{name}.pc +%{_bindir}/activemqcpp-config + +%files doc +%defattr(-,root,root,-) +%doc doc/%{name}.pdf + +%changelog +* Fri Dec 11 2009 Steve Traylen - 2.2.6-5 +- Add libuuid-devel as Requires to -devel package. +* Sat Nov 14 2009 Steve Traylen - 2.2.6-4 +- Remove patch to relocate headers from versioned directory. +- Add make smp options to make check. +* Fri Nov 6 2009 Steve Traylen - 2.2.6-3 +- Relocate headers to non versioned directory with patch0 +* Fri Nov 6 2009 Steve Traylen - 2.2.6-2 +- Adapted to Fedora guidelines. +* Thu Feb 26 2009 Ricardo Rocha - 2.2.6-1 +- First version of the spec file + + diff --git a/import.log b/import.log new file mode 100644 index 0000000..0975c89 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +activemq-cpp-2_2_6-5_fc13:HEAD:activemq-cpp-2.2.6-5.fc13.src.rpm:1260816471 diff --git a/sources b/sources index e69de29..0ea5cd6 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +1222f0d6c5f86ef3ed5a558a533c7564 activemq-cpp-2.2.6-src.tar.gz From 405c8bab00e52d0791a3da8279ae464d1416cbf0 Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Tue, 15 Dec 2009 13:56:29 +0000 Subject: [PATCH 02/32] Update 3.0.1 --- .cvsignore | 2 +- activemq-cpp.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7499bc0..a380730 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -activemq-cpp-2.2.6-src.tar.gz +activemq-cpp-library-3.0.1-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 208d04e..b3082bc 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,12 +1,12 @@ Name: activemq-cpp -Version: 2.2.6 -Release: 5%{?dist} +Version: 3.0.1 +Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries License: ASL 2.0 URL: http://activemq.apache.org/cms/ -Source0: http://www.apache.org/dyn/closer.cgi/activemq/activemq-cpp/source/activemq-cpp-%{version}-src.tar.gz +Source0: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{version}-src.tar.gz # Some local texmf configuration to increase default pool_size. Patch1: %{name}-local-texmf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -82,13 +82,13 @@ for your clients to communicate. %{name}-doc contains api documentation. %prep -%setup -q +%setup -q -n activemq-cpp-library-%{version} %patch1 -p1 - +chmod 644 LICENSE.txt +chmod 644 src/main/activemq/transport/mock/MockTransport.cpp %build -mkdir config ./autogen.sh # Build pdf(30MB) rather than default html(400MB). %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf @@ -130,6 +130,9 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Fri Dec 11 2009 Steve Traylen - 3.0.1-1 +- Upstream to 3.0.1 +- Tar ball name change. * Fri Dec 11 2009 Steve Traylen - 2.2.6-5 - Add libuuid-devel as Requires to -devel package. * Sat Nov 14 2009 Steve Traylen - 2.2.6-4 diff --git a/sources b/sources index 0ea5cd6..e38bf34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1222f0d6c5f86ef3ed5a558a533c7564 activemq-cpp-2.2.6-src.tar.gz +b917d8a27841e9ab0aeeb2297f771447 activemq-cpp-library-3.0.1-src.tar.gz From 96b8b3300fe8c1177a7d5ad543c5ff2f0d52651c Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Tue, 9 Feb 2010 12:17:20 +0000 Subject: [PATCH 03/32] Upstream to 3.1.0. --- .cvsignore | 2 +- activemq-cpp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index a380730..af17dc3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -activemq-cpp-library-3.0.1-src.tar.gz +activemq-cpp-library-3.1.0-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index b3082bc..9328f98 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,5 +1,5 @@ Name: activemq-cpp -Version: 3.0.1 +Version: 3.1.0 Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client @@ -130,6 +130,9 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Tue Jan 9 2010 Steve Traylen - 3.1.0-1 +- Upstream to 3.1.0 + * Fri Dec 11 2009 Steve Traylen - 3.0.1-1 - Upstream to 3.0.1 - Tar ball name change. diff --git a/sources b/sources index e38bf34..9a01de9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b917d8a27841e9ab0aeeb2297f771447 activemq-cpp-library-3.0.1-src.tar.gz +a501bd7a12bb3db8931df3bf2012c8d6 activemq-cpp-library-3.1.0-src.tar.gz From a64fe8dfed268211bc1365b89ab7a59897284f6c Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Fri, 30 Apr 2010 13:48:45 +0000 Subject: [PATCH 04/32] Upstream 3.1.2. --- .cvsignore | 2 +- activemq-cpp.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index af17dc3..c2f0ff5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -activemq-cpp-library-3.1.0-src.tar.gz +activemq-cpp-library-3.1.2-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 9328f98..1d0e047 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,5 +1,5 @@ Name: activemq-cpp -Version: 3.1.0 +Version: 3.1.2 Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client @@ -130,21 +130,29 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Fri Apr 3 2010 Steve Traylen - 3.1.2-1 +- Upstream to 3.1.2 + * Tue Jan 9 2010 Steve Traylen - 3.1.0-1 - Upstream to 3.1.0 * Fri Dec 11 2009 Steve Traylen - 3.0.1-1 - Upstream to 3.0.1 - Tar ball name change. + * Fri Dec 11 2009 Steve Traylen - 2.2.6-5 - Add libuuid-devel as Requires to -devel package. + * Sat Nov 14 2009 Steve Traylen - 2.2.6-4 - Remove patch to relocate headers from versioned directory. - Add make smp options to make check. + * Fri Nov 6 2009 Steve Traylen - 2.2.6-3 - Relocate headers to non versioned directory with patch0 + * Fri Nov 6 2009 Steve Traylen - 2.2.6-2 - Adapted to Fedora guidelines. + * Thu Feb 26 2009 Ricardo Rocha - 2.2.6-1 - First version of the spec file diff --git a/sources b/sources index 9a01de9..4a6e463 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a501bd7a12bb3db8931df3bf2012c8d6 activemq-cpp-library-3.1.0-src.tar.gz +a553210201d97a9ff76762bdfe548c29 activemq-cpp-library-3.1.2-src.tar.gz From 183c1926803bb50a1313cb4266f253efc56cf20a Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Thu, 22 Jul 2010 09:16:17 +0000 Subject: [PATCH 05/32] Upstream 3.2.1 --- .cvsignore | 2 +- activemq-cpp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index c2f0ff5..594114c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -activemq-cpp-library-3.1.2-src.tar.gz +activemq-cpp-library-3.2.1-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 1d0e047..97660b6 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,5 +1,5 @@ Name: activemq-cpp -Version: 3.1.2 +Version: 3.2.1 Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client @@ -130,6 +130,9 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Thu Jul 22 2010 Steve Traylen - 3.2.1-1 +- Upstream to 3.2.1 + * Fri Apr 3 2010 Steve Traylen - 3.1.2-1 - Upstream to 3.1.2 diff --git a/sources b/sources index 4a6e463..a15690b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a553210201d97a9ff76762bdfe548c29 activemq-cpp-library-3.1.2-src.tar.gz +877d0e4bdedfdaaad37e18c80d85493d activemq-cpp-library-3.2.1-src.tar.gz From fff9a20cbffa9be1ddba0b59c7a25c58fe52eda4 Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Thu, 22 Jul 2010 09:29:31 +0000 Subject: [PATCH 06/32] BR of openssl-devel. --- activemq-cpp.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 97660b6..726b2d7 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -13,6 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen BuildRequires: graphviz +BuildRequires: openssl-devel %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else @@ -132,6 +133,8 @@ make %{?_smp_mflags} check %changelog * Thu Jul 22 2010 Steve Traylen - 3.2.1-1 - Upstream to 3.2.1 +- Add BR of openssl-devel since library now supports ssl + connections. * Fri Apr 3 2010 Steve Traylen - 3.1.2-1 - Upstream to 3.1.2 From f3d134a6e6f4f9631c3026f0471bd8b2401a9e2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:35:27 +0000 Subject: [PATCH 07/32] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4e715a9..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: activemq-cpp -# $Id$ -NAME := activemq-cpp -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 0975c89..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -activemq-cpp-2_2_6-5_fc13:HEAD:activemq-cpp-2.2.6-5.fc13.src.rpm:1260816471 From f915ebf4205defae64ae0138cc4fa76044e350dd Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 10 Nov 2010 23:09:22 +0100 Subject: [PATCH 08/32] - Upstream to 3.2.3 --- .gitignore | 1 + activemq-cpp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 594114c..801c845 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ activemq-cpp-library-3.2.1-src.tar.gz +/activemq-cpp-library-3.2.3-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 726b2d7..52a281e 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,5 +1,5 @@ Name: activemq-cpp -Version: 3.2.1 +Version: 3.2.3 Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client @@ -131,6 +131,9 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Wed Nov 10 2010 Steve Traylen - 3.2.3-1 +- Upstream to 3.2.3 + * Thu Jul 22 2010 Steve Traylen - 3.2.1-1 - Upstream to 3.2.1 - Add BR of openssl-devel since library now supports ssl diff --git a/sources b/sources index a15690b..a7ec911 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -877d0e4bdedfdaaad37e18c80d85493d activemq-cpp-library-3.2.1-src.tar.gz +f4a3db74eeb874aee925714bcb3c2c84 activemq-cpp-library-3.2.3-src.tar.gz From 885c7963781272416bcd22986c0388347c1c9168 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sun, 6 Feb 2011 16:46:27 +0100 Subject: [PATCH 09/32] - Upstream to 3.2.4 --- .gitignore | 1 + activemq-cpp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 801c845..141299b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ activemq-cpp-library-3.2.1-src.tar.gz /activemq-cpp-library-3.2.3-src.tar.gz +/activemq-cpp-library-3.2.4-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 52a281e..5f1d7b9 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,5 +1,5 @@ Name: activemq-cpp -Version: 3.2.3 +Version: 3.2.4 Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client @@ -131,6 +131,9 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Sun Feb 6 2011 Steve Traylen - 3.2.4-1 +- Upstream to 3.2.4 + * Wed Nov 10 2010 Steve Traylen - 3.2.3-1 - Upstream to 3.2.3 diff --git a/sources b/sources index a7ec911..ac8a90f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4a3db74eeb874aee925714bcb3c2c84 activemq-cpp-library-3.2.3-src.tar.gz +ae38ec737dfd41864848c1b92fb74f7a activemq-cpp-library-3.2.4-src.tar.gz From 449ced5ba40fa4b0212c371ab098a6fbc8152ac1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:18:34 -0600 Subject: [PATCH 10/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 5f1d7b9..874a81f 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,6 +1,6 @@ Name: activemq-cpp Version: 3.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -131,6 +131,9 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 3.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun Feb 6 2011 Steve Traylen - 3.2.4-1 - Upstream to 3.2.4 From 1c57dacfda6e6a4985965d57ed7d2bf6e36ea331 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Mon, 7 Mar 2011 22:56:38 +0100 Subject: [PATCH 11/32] Upstream to 3.2.5 --- .gitignore | 1 + activemq-cpp.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 141299b..7dc4fec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ activemq-cpp-library-3.2.1-src.tar.gz /activemq-cpp-library-3.2.3-src.tar.gz /activemq-cpp-library-3.2.4-src.tar.gz +/activemq-cpp-library-3.2.5-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 874a81f..7c32da1 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,6 +1,6 @@ Name: activemq-cpp -Version: 3.2.4 -Release: 2%{?dist} +Version: 3.2.5 +Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -131,6 +131,9 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Mon Mar 7 2011 Steve Traylen - 3.2.5-1 +- Upstream to 3.2.5 + * Mon Feb 07 2011 Fedora Release Engineering - 3.2.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index ac8a90f..dc6fa55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ae38ec737dfd41864848c1b92fb74f7a activemq-cpp-library-3.2.4-src.tar.gz +47341f057cee34997ca826f526e3f681 activemq-cpp-library-3.2.5-src.tar.gz From 088fd1ed3c5a408e0d141e991a8f268e5c3b5a0a Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Mon, 7 Mar 2011 22:57:36 +0100 Subject: [PATCH 12/32] autoconf step removed. --- activemq-cpp.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 7c32da1..afe613b 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -20,9 +20,6 @@ BuildRequires: tex(latex) BuildRequires: tetex-latex %endif -BuildRequires: automake >= 1.10 -BuildRequires: autoconf >= 2.60 -BuildRequires: libtool >= 1.5.24 BuildRequires: apr-util-devel%{?_isa} >= 1.3 BuildRequires: cppunit-devel%{?_isa} >= 1.10.2 @@ -90,7 +87,6 @@ chmod 644 src/main/activemq/transport/mock/MockTransport.cpp %build -./autogen.sh # Build pdf(30MB) rather than default html(400MB). %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf make %{?_smp_mflags} @@ -132,6 +128,7 @@ make %{?_smp_mflags} check %changelog * Mon Mar 7 2011 Steve Traylen - 3.2.5-1 +- autoconf step removed. - Upstream to 3.2.5 * Mon Feb 07 2011 Fedora Release Engineering - 3.2.4-2 From 0332ea2e1e5477e13fe0b769f95416a1c2b8674f Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Mon, 18 Apr 2011 19:45:23 +0200 Subject: [PATCH 13/32] Upstream to 3.3.0 --- .gitignore | 1 + activemq-cpp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7dc4fec..e502308 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ activemq-cpp-library-3.2.1-src.tar.gz /activemq-cpp-library-3.2.3-src.tar.gz /activemq-cpp-library-3.2.4-src.tar.gz /activemq-cpp-library-3.2.5-src.tar.gz +/activemq-cpp-library-3.3.0-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index afe613b..2c53f5b 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,5 +1,5 @@ Name: activemq-cpp -Version: 3.2.5 +Version: 3.3.0 Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client @@ -127,6 +127,9 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Mon Apr 18 2011 Steve Traylen - 3.3.0-1 +- Upstream to 3.3.0 + * Mon Mar 7 2011 Steve Traylen - 3.2.5-1 - autoconf step removed. - Upstream to 3.2.5 diff --git a/sources b/sources index dc6fa55..89a5478 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -47341f057cee34997ca826f526e3f681 activemq-cpp-library-3.2.5-src.tar.gz +78142c4a90520071cb7c7f14e192fa12 activemq-cpp-library-3.3.0-src.tar.gz From 90f817d3afbb2df6fb7101a401a559169a5e5d03 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Tue, 19 Jul 2011 01:11:42 +0200 Subject: [PATCH 14/32] Upstream to 3.4.0 --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 2c53f5b..c9794e6 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,5 +1,5 @@ Name: activemq-cpp -Version: 3.3.0 +Version: 3.4.0 Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client @@ -127,6 +127,9 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Tue Jul 10 2011 Steve Traylen - 3.4.0-1 +- Upstream to 3.4.0 + * Mon Apr 18 2011 Steve Traylen - 3.3.0-1 - Upstream to 3.3.0 From 0498eefecb2ee1446c26f5b8a431cac266f1fb7c Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sat, 29 Oct 2011 15:52:37 +0200 Subject: [PATCH 15/32] Update to 3.4.0 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e502308..05fe5c3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ activemq-cpp-library-3.2.1-src.tar.gz /activemq-cpp-library-3.2.4-src.tar.gz /activemq-cpp-library-3.2.5-src.tar.gz /activemq-cpp-library-3.3.0-src.tar.gz +/activemq-cpp-library-3.4.0-src.tar.gz diff --git a/sources b/sources index 89a5478..7d15e73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78142c4a90520071cb7c7f14e192fa12 activemq-cpp-library-3.3.0-src.tar.gz +1e476bb5e8b98d095c0ac917ebd31026 activemq-cpp-library-3.4.0-src.tar.gz From 05f8229904c36e0d334c239cfa573bb7d94aa98f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 15:00:16 -0600 Subject: [PATCH 16/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index c9794e6..9abb216 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,6 +1,6 @@ Name: activemq-cpp Version: 3.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -127,6 +127,9 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 3.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Jul 10 2011 Steve Traylen - 3.4.0-1 - Upstream to 3.4.0 From 169a338d28b2729b07797e20d4216afd976e6a6a Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Mon, 20 Feb 2012 15:03:09 +0100 Subject: [PATCH 17/32] Upstream to 3.4.1 Add patch for gcc47, AMQCPP-389 --- .gitignore | 1 + activemq-cpp-gcc47.patch | 12 ++++++++++++ activemq-cpp.spec | 13 ++++++++++--- sources | 2 +- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 activemq-cpp-gcc47.patch diff --git a/.gitignore b/.gitignore index 05fe5c3..3668d2d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ activemq-cpp-library-3.2.1-src.tar.gz /activemq-cpp-library-3.2.5-src.tar.gz /activemq-cpp-library-3.3.0-src.tar.gz /activemq-cpp-library-3.4.0-src.tar.gz +/activemq-cpp-library-3.4.1-src.tar.gz diff --git a/activemq-cpp-gcc47.patch b/activemq-cpp-gcc47.patch new file mode 100644 index 0000000..2e5c962 --- /dev/null +++ b/activemq-cpp-gcc47.patch @@ -0,0 +1,12 @@ +diff -uNr activemq-cpp-library-3.4.1.ORIG/src/main/decaf/util/AbstractQueue.h activemq-cpp-library-3.4.1/src/main/decaf/util/AbstractQueue.h +--- activemq-cpp-library-3.4.1.ORIG/src/main/decaf/util/AbstractQueue.h 2012-02-19 21:37:49.536000023 +0100 ++++ activemq-cpp-library-3.4.1/src/main/decaf/util/AbstractQueue.h 2012-02-19 21:38:56.722000023 +0100 +@@ -60,7 +60,7 @@ + */ + virtual bool add( const E& value ) { + +- if( offer( value ) ) { ++ if( this->offer( value ) ) { + return true; + } + diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 9abb216..a68c7ea 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,6 +1,6 @@ Name: activemq-cpp -Version: 3.4.0 -Release: 2%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -8,7 +8,9 @@ License: ASL 2.0 URL: http://activemq.apache.org/cms/ Source0: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{version}-src.tar.gz # Some local texmf configuration to increase default pool_size. -Patch1: %{name}-local-texmf.patch +Patch1: activemq-cpp-local-texmf.patch +# https://issues.apache.org/jira/browse/AMQCPP-389 +Patch2: activemq-cpp-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen @@ -82,6 +84,7 @@ for your clients to communicate. %prep %setup -q -n activemq-cpp-library-%{version} %patch1 -p1 +%patch2 -p1 chmod 644 LICENSE.txt chmod 644 src/main/activemq/transport/mock/MockTransport.cpp @@ -127,6 +130,10 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Tue Feb 12 2012 Steve Traylen - 3.4.1-1 +- Upstream to 3.4.1 +- Add patch for gcc47, AMQCPP-389 + * Thu Jan 12 2012 Fedora Release Engineering - 3.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 7d15e73..2ea7a9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1e476bb5e8b98d095c0ac917ebd31026 activemq-cpp-library-3.4.0-src.tar.gz +04bf86d82dbace2e6b256315427358a6 activemq-cpp-library-3.4.1-src.tar.gz From f0d732a2dab22ad11ee513e25a9970554d60a9db Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 28 Feb 2012 11:39:06 -0600 Subject: [PATCH 18/32] - Rebuilt for c++ ABI breakage --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index a68c7ea..9222fd2 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,6 +1,6 @@ Name: activemq-cpp Version: 3.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -130,6 +130,9 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Tue Feb 28 2012 Fedora Release Engineering - 3.4.1-2 +- Rebuilt for c++ ABI breakage + * Tue Feb 12 2012 Steve Traylen - 3.4.1-1 - Upstream to 3.4.1 - Add patch for gcc47, AMQCPP-389 From bd98c5b0f3299c2233df6f2d11713cdf4003283f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:34:22 -0500 Subject: [PATCH 19/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 9222fd2..7aed868 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,6 +1,6 @@ Name: activemq-cpp Version: 3.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -130,6 +130,9 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 3.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Feb 28 2012 Fedora Release Engineering - 3.4.1-2 - Rebuilt for c++ ABI breakage From 90bcef2579be35599bdf4a5238b52136bf68af07 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sun, 16 Sep 2012 15:43:22 +0200 Subject: [PATCH 20/32] Upstream to 3.4.4 --- .gitignore | 1 + activemq-cpp.spec | 31 +++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 3668d2d..e0a3da5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ activemq-cpp-library-3.2.1-src.tar.gz /activemq-cpp-library-3.3.0-src.tar.gz /activemq-cpp-library-3.4.0-src.tar.gz /activemq-cpp-library-3.4.1-src.tar.gz +/activemq-cpp-library-3.4.4-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 7aed868..db252d9 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,27 +1,32 @@ +%global with_docs 0 + Name: activemq-cpp -Version: 3.4.1 -Release: 3%{?dist} +Version: 3.4.4 +Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries License: ASL 2.0 URL: http://activemq.apache.org/cms/ Source0: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{version}-src.tar.gz +%if %{?with_docs}0 # Some local texmf configuration to increase default pool_size. Patch1: activemq-cpp-local-texmf.patch +%endif # https://issues.apache.org/jira/browse/AMQCPP-389 Patch2: activemq-cpp-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: openssl-devel +%if %{?with_docs}0 BuildRequires: doxygen BuildRequires: graphviz -BuildRequires: openssl-devel %if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) %else BuildRequires: tetex-latex %endif - +%endif BuildRequires: apr-util-devel%{?_isa} >= 1.3 BuildRequires: cppunit-devel%{?_isa} >= 1.10.2 @@ -63,7 +68,7 @@ for your clients to communicate. %{name}-devel contains development header files. - +%if %{?with_docs}0 %package doc Summary: C++ implementation header files for JMS-like messaging Group: Documentation @@ -80,10 +85,13 @@ library, a message broker such as Apache ActiveMQ is still needed for your clients to communicate. %{name}-doc contains api documentation. +%endif %prep %setup -q -n activemq-cpp-library-%{version} +%if %{?with_docs}0 %patch1 -p1 +%endif %patch2 -p1 chmod 644 LICENSE.txt chmod 644 src/main/activemq/transport/mock/MockTransport.cpp @@ -91,12 +99,18 @@ chmod 644 src/main/activemq/transport/mock/MockTransport.cpp %build # Build pdf(30MB) rather than default html(400MB). +%if %{?with_docs}0 %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf +%else +%configure --disable-static +%endif + make %{?_smp_mflags} +%if %{?with_docs}0 make %{?_smp_mflags} doxygen-run cp -p texmf.cnf doc/latex/texmf.cnf make %{?_smp_mflags} doxygen-pdf - +%endif %install rm -rf $RPM_BUILD_ROOT @@ -125,11 +139,16 @@ make %{?_smp_mflags} check %{_libdir}/pkgconfig/%{name}.pc %{_bindir}/activemqcpp-config +%if %{?with_docs}0 %files doc %defattr(-,root,root,-) %doc doc/%{name}.pdf +%endif %changelog +* Sun Sep 16 2012 Steve Traylen - 3.4.4-1 +- Upstream to 3.4.4 + * Wed Jul 18 2012 Fedora Release Engineering - 3.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 2ea7a9f..65b447b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04bf86d82dbace2e6b256315427358a6 activemq-cpp-library-3.4.1-src.tar.gz +4438e83260465e7e75e077124e983621 activemq-cpp-library-3.4.4-src.tar.gz From 7da9a4830eac22a27fa2441395b0005c3107b14a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:17:32 -0600 Subject: [PATCH 21/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index db252d9..360f758 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,7 +2,7 @@ Name: activemq-cpp Version: 3.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -146,6 +146,9 @@ make %{?_smp_mflags} check %endif %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 3.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Sep 16 2012 Steve Traylen - 3.4.4-1 - Upstream to 3.4.4 From 923842f4a28408c471e692ad93d9c229d64c6404 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:14:09 -0500 Subject: [PATCH 22/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 360f758..409aa5e 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,7 +2,7 @@ Name: activemq-cpp Version: 3.4.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -146,6 +146,9 @@ make %{?_smp_mflags} check %endif %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 3.4.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 3.4.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 95cc01aa07e9b3293444be20ec0a07665b745250 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 4 Sep 2013 22:32:46 +0000 Subject: [PATCH 23/32] Upstream to 3.7.1 --- .gitignore | 1 + activemq-cpp.spec | 18 +++++++++--------- sources | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index e0a3da5..474d1a2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ activemq-cpp-library-3.2.1-src.tar.gz /activemq-cpp-library-3.4.0-src.tar.gz /activemq-cpp-library-3.4.1-src.tar.gz /activemq-cpp-library-3.4.4-src.tar.gz +/activemq-cpp-library-3.7.1-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 409aa5e..c35bf12 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,8 +1,8 @@ %global with_docs 0 Name: activemq-cpp -Version: 3.4.4 -Release: 3%{?dist} +Version: 3.7.1 +Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -13,8 +13,6 @@ Source0: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq # Some local texmf configuration to increase default pool_size. Patch1: activemq-cpp-local-texmf.patch %endif -# https://issues.apache.org/jira/browse/AMQCPP-389 -Patch2: activemq-cpp-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel @@ -92,7 +90,6 @@ for your clients to communicate. %if %{?with_docs}0 %patch1 -p1 %endif -%patch2 -p1 chmod 644 LICENSE.txt chmod 644 src/main/activemq/transport/mock/MockTransport.cpp @@ -146,6 +143,9 @@ make %{?_smp_mflags} check %endif %changelog +* Wed Sep 4 2013 Steve Traylen - 3.7.1-1 +- Upstream to 3.7.1 + * Sat Aug 03 2013 Fedora Release Engineering - 3.4.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -161,14 +161,14 @@ make %{?_smp_mflags} check * Tue Feb 28 2012 Fedora Release Engineering - 3.4.1-2 - Rebuilt for c++ ABI breakage -* Tue Feb 12 2012 Steve Traylen - 3.4.1-1 +* Sun Feb 12 2012 Steve Traylen - 3.4.1-1 - Upstream to 3.4.1 - Add patch for gcc47, AMQCPP-389 * Thu Jan 12 2012 Fedora Release Engineering - 3.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Tue Jul 10 2011 Steve Traylen - 3.4.0-1 +* Sun Jul 10 2011 Steve Traylen - 3.4.0-1 - Upstream to 3.4.0 * Mon Apr 18 2011 Steve Traylen - 3.3.0-1 @@ -192,10 +192,10 @@ make %{?_smp_mflags} check - Add BR of openssl-devel since library now supports ssl connections. -* Fri Apr 3 2010 Steve Traylen - 3.1.2-1 +* Sat Apr 3 2010 Steve Traylen - 3.1.2-1 - Upstream to 3.1.2 -* Tue Jan 9 2010 Steve Traylen - 3.1.0-1 +* Sat Jan 9 2010 Steve Traylen - 3.1.0-1 - Upstream to 3.1.0 * Fri Dec 11 2009 Steve Traylen - 3.0.1-1 diff --git a/sources b/sources index 65b447b..9dfe634 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4438e83260465e7e75e077124e983621 activemq-cpp-library-3.4.4-src.tar.gz +2a577ef3f900bd2735a32398366088ff activemq-cpp-library-3.7.1-src.tar.gz From da47d6a12b426704010bb9a8b5fa7b1f84ada7d4 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 23 Jan 2014 12:53:14 +0000 Subject: [PATCH 24/32] Upstream to 3.8.2 --- .gitignore | 1 + activemq-cpp.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 474d1a2..44f5c0d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ activemq-cpp-library-3.2.1-src.tar.gz /activemq-cpp-library-3.4.1-src.tar.gz /activemq-cpp-library-3.4.4-src.tar.gz /activemq-cpp-library-3.7.1-src.tar.gz +/activemq-cpp-library-3.8.2-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index c35bf12..886341d 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,7 +1,7 @@ %global with_docs 0 Name: activemq-cpp -Version: 3.7.1 +Version: 3.8.2 Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client @@ -143,6 +143,9 @@ make %{?_smp_mflags} check %endif %changelog +* Thu Jan 23 2014 Steve Traylen - 3.8.2-1 +- Upstream to 3.8.2 + * Wed Sep 4 2013 Steve Traylen - 3.7.1-1 - Upstream to 3.7.1 diff --git a/sources b/sources index 9dfe634..46e44c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a577ef3f900bd2735a32398366088ff activemq-cpp-library-3.7.1-src.tar.gz +5b853f5f866ea21a9a58564c7a2b8e59 activemq-cpp-library-3.8.2-src.tar.gz From 33ffad74f8dacf165d1e4238fda5068525cea2ed Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 30 May 2014 12:38:07 +0000 Subject: [PATCH 25/32] Drop some white space --- activemq-cpp-3.8.2-system-zlib.patch | 177 +++++++++++++++++++++++++++ activemq-cpp.spec | 14 ++- 2 files changed, 185 insertions(+), 6 deletions(-) create mode 100644 activemq-cpp-3.8.2-system-zlib.patch diff --git a/activemq-cpp-3.8.2-system-zlib.patch b/activemq-cpp-3.8.2-system-zlib.patch new file mode 100644 index 0000000..c14e202 --- /dev/null +++ b/activemq-cpp-3.8.2-system-zlib.patch @@ -0,0 +1,177 @@ +diff --git a/src/main/Makefile.am b/src/main/Makefile.am +index 5d117aa..9e71d92 100644 +--- a/src/main/Makefile.am ++++ b/src/main/Makefile.am +@@ -385,20 +385,6 @@ cc_sources = \ + decaf/internal/util/concurrent/Threading.cpp \ + decaf/internal/util/concurrent/unix/Atomics.cpp \ + decaf/internal/util/concurrent/unix/PlatformThread.cpp \ +- decaf/internal/util/zip/adler32.c \ +- decaf/internal/util/zip/crc32.c \ +- decaf/internal/util/zip/deflate.c \ +- decaf/internal/util/zip/gzclose.c \ +- decaf/internal/util/zip/gzlib.c \ +- decaf/internal/util/zip/gzread.c \ +- decaf/internal/util/zip/gzwrite.c \ +- decaf/internal/util/zip/infback.c \ +- decaf/internal/util/zip/inffast.c \ +- decaf/internal/util/zip/inflate.c \ +- decaf/internal/util/zip/inftrees.c \ +- decaf/internal/util/zip/trees.c \ +- decaf/internal/util/zip/uncompr.c \ +- decaf/internal/util/zip/zutil.c \ + decaf/io/BlockingByteArrayInputStream.cpp \ + decaf/io/BufferedInputStream.cpp \ + decaf/io/BufferedOutputStream.cpp \ +@@ -1042,17 +1028,6 @@ h_sources = \ + decaf/internal/util/concurrent/Transferer.h \ + decaf/internal/util/concurrent/unix/PlatformDefs.h \ + decaf/internal/util/concurrent/windows/PlatformDefs.h \ +- decaf/internal/util/zip/crc32.h \ +- decaf/internal/util/zip/deflate.h \ +- decaf/internal/util/zip/gzguts.h \ +- decaf/internal/util/zip/inffast.h \ +- decaf/internal/util/zip/inffixed.h \ +- decaf/internal/util/zip/inflate.h \ +- decaf/internal/util/zip/inftrees.h \ +- decaf/internal/util/zip/trees.h \ +- decaf/internal/util/zip/zconf.h \ +- decaf/internal/util/zip/zlib.h \ +- decaf/internal/util/zip/zutil.h \ + decaf/io/BlockingByteArrayInputStream.h \ + decaf/io/BufferedInputStream.h \ + decaf/io/BufferedOutputStream.h \ +@@ -1327,7 +1302,7 @@ libactivemq_cpp_la_SOURCES= $(h_sources) $(cc_sources) + libactivemq_cpp_la_CXXFLAGS= $(AMQ_CXXFLAGS) + libactivemq_cpp_la_CFLAGS= $(AMQ_CFLAGS) + libactivemq_cpp_la_LDFLAGS= -version-info $(ACTIVEMQ_LIBRARY_VERSION) +-libactivemq_cpp_la_LIBADD= $(AMQ_LIBS) ++libactivemq_cpp_la_LIBADD= $(AMQ_LIBS) -lz + + ## + ## Packaging Info +diff --git a/src/main/Makefile.in b/src/main/Makefile.in +index a53e327..53e79c1 100644 +--- a/src/main/Makefile.in ++++ b/src/main/Makefile.in +@@ -493,20 +493,6 @@ am__objects_2 = activemq/cmsutil/libactivemq_cpp_la-CachedConsumer.lo \ + decaf/internal/util/concurrent/libactivemq_cpp_la-Threading.lo \ + decaf/internal/util/concurrent/unix/libactivemq_cpp_la-Atomics.lo \ + decaf/internal/util/concurrent/unix/libactivemq_cpp_la-PlatformThread.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-adler32.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-crc32.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-deflate.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-gzclose.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-gzlib.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-gzread.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-gzwrite.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-infback.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-inffast.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-inflate.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-inftrees.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-trees.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-uncompr.lo \ +- decaf/internal/util/zip/libactivemq_cpp_la-zutil.lo \ + decaf/io/libactivemq_cpp_la-BlockingByteArrayInputStream.lo \ + decaf/io/libactivemq_cpp_la-BufferedInputStream.lo \ + decaf/io/libactivemq_cpp_la-BufferedOutputStream.lo \ +@@ -1346,20 +1332,6 @@ cc_sources = \ + decaf/internal/util/concurrent/Threading.cpp \ + decaf/internal/util/concurrent/unix/Atomics.cpp \ + decaf/internal/util/concurrent/unix/PlatformThread.cpp \ +- decaf/internal/util/zip/adler32.c \ +- decaf/internal/util/zip/crc32.c \ +- decaf/internal/util/zip/deflate.c \ +- decaf/internal/util/zip/gzclose.c \ +- decaf/internal/util/zip/gzlib.c \ +- decaf/internal/util/zip/gzread.c \ +- decaf/internal/util/zip/gzwrite.c \ +- decaf/internal/util/zip/infback.c \ +- decaf/internal/util/zip/inffast.c \ +- decaf/internal/util/zip/inflate.c \ +- decaf/internal/util/zip/inftrees.c \ +- decaf/internal/util/zip/trees.c \ +- decaf/internal/util/zip/uncompr.c \ +- decaf/internal/util/zip/zutil.c \ + decaf/io/BlockingByteArrayInputStream.cpp \ + decaf/io/BufferedInputStream.cpp \ + decaf/io/BufferedOutputStream.cpp \ +@@ -2002,17 +1974,6 @@ h_sources = \ + decaf/internal/util/concurrent/Transferer.h \ + decaf/internal/util/concurrent/unix/PlatformDefs.h \ + decaf/internal/util/concurrent/windows/PlatformDefs.h \ +- decaf/internal/util/zip/crc32.h \ +- decaf/internal/util/zip/deflate.h \ +- decaf/internal/util/zip/gzguts.h \ +- decaf/internal/util/zip/inffast.h \ +- decaf/internal/util/zip/inffixed.h \ +- decaf/internal/util/zip/inflate.h \ +- decaf/internal/util/zip/inftrees.h \ +- decaf/internal/util/zip/trees.h \ +- decaf/internal/util/zip/zconf.h \ +- decaf/internal/util/zip/zlib.h \ +- decaf/internal/util/zip/zutil.h \ + decaf/io/BlockingByteArrayInputStream.h \ + decaf/io/BufferedInputStream.h \ + decaf/io/BufferedOutputStream.h \ +@@ -2282,7 +2243,7 @@ libactivemq_cpp_la_SOURCES = $(h_sources) $(cc_sources) + libactivemq_cpp_la_CXXFLAGS = $(AMQ_CXXFLAGS) + libactivemq_cpp_la_CFLAGS = $(AMQ_CFLAGS) + libactivemq_cpp_la_LDFLAGS = -version-info $(ACTIVEMQ_LIBRARY_VERSION) +-libactivemq_cpp_la_LIBADD = $(AMQ_LIBS) ++libactivemq_cpp_la_LIBADD = $(AMQ_LIBS) -lz + library_includedir = $(includedir)/$(ACTIVEMQ_LIBRARY_NAME)-$(ACTIVEMQ_VERSION) + nobase_library_include_HEADERS = $(h_sources) + all: all-am +diff --git a/src/main/decaf/util/zip/Adler32.cpp b/src/main/decaf/util/zip/Adler32.cpp +index 517fbb4..f1fcd3c 100644 +--- a/src/main/decaf/util/zip/Adler32.cpp ++++ b/src/main/decaf/util/zip/Adler32.cpp +@@ -17,7 +17,7 @@ + + #include "Adler32.h" + +-#include ++#include + + using namespace decaf; + using namespace decaf::lang; +diff --git a/src/main/decaf/util/zip/CRC32.cpp b/src/main/decaf/util/zip/CRC32.cpp +index 5d3b308..8b100bc 100644 +--- a/src/main/decaf/util/zip/CRC32.cpp ++++ b/src/main/decaf/util/zip/CRC32.cpp +@@ -17,7 +17,7 @@ + + #include "CRC32.h" + +-#include ++#include + + using namespace decaf; + using namespace decaf::lang; +diff --git a/src/main/decaf/util/zip/Deflater.cpp b/src/main/decaf/util/zip/Deflater.cpp +index 12f4184..be21808 100644 +--- a/src/main/decaf/util/zip/Deflater.cpp ++++ b/src/main/decaf/util/zip/Deflater.cpp +@@ -20,7 +20,7 @@ + #include + #include + +-#include ++#include + #include + + using namespace decaf; +diff --git a/src/main/decaf/util/zip/Inflater.cpp b/src/main/decaf/util/zip/Inflater.cpp +index bb0923f..e0dde29 100644 +--- a/src/main/decaf/util/zip/Inflater.cpp ++++ b/src/main/decaf/util/zip/Inflater.cpp +@@ -20,7 +20,7 @@ + #include + #include + +-#include ++#include + + #include + diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 886341d..e60e193 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,20 +2,20 @@ Name: activemq-cpp Version: 3.8.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries License: ASL 2.0 URL: http://activemq.apache.org/cms/ Source0: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{version}-src.tar.gz -%if %{?with_docs}0 +Patch0: activemq-cpp-3.8.2-system-zlib.patch # Some local texmf configuration to increase default pool_size. Patch1: activemq-cpp-local-texmf.patch -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel +BuildRequires: zlib-devel %if %{?with_docs}0 BuildRequires: doxygen BuildRequires: graphviz @@ -53,9 +53,6 @@ Requires: libuuid-devel%{?_isa} Requires: e2fsprogs-devel%{?_isa} %endif - - - %description devel activemq-cpp is a JMS-like API for C++ for interfacing with Message Brokers such as Apache ActiveMQ. C++ messaging service helps to make @@ -87,6 +84,8 @@ for your clients to communicate. %prep %setup -q -n activemq-cpp-library-%{version} +%patch0 -p1 +rm -r src/main/decaf/internal/util/zip %if %{?with_docs}0 %patch1 -p1 %endif @@ -143,6 +142,9 @@ make %{?_smp_mflags} check %endif %changelog +* Thu May 29 2014 Ville Skyttä - 3.8.2-2 +- Patch to use system zlib instead of bundled one + * Thu Jan 23 2014 Steve Traylen - 3.8.2-1 - Upstream to 3.8.2 From bbef24b7b6ee764e1dfa99b0b4b80f562a52c382 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 19:05:24 -0500 Subject: [PATCH 26/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index e60e193..8c0cff0 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,7 +2,7 @@ Name: activemq-cpp Version: 3.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -142,6 +142,9 @@ make %{?_smp_mflags} check %endif %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 3.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu May 29 2014 Ville Skyttä - 3.8.2-2 - Patch to use system zlib instead of bundled one From f4fc83bc627e4a27e532bf54a6bb76877b593970 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 19:59:08 +0000 Subject: [PATCH 27/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- activemq-cpp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 8c0cff0..4b0573c 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,7 +2,7 @@ Name: activemq-cpp Version: 3.8.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -142,6 +142,9 @@ make %{?_smp_mflags} check %endif %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 3.8.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 3.8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 58a1b0818b33b51680d4e214ab278536a779e5b0 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 27 Aug 2014 13:49:51 +0000 Subject: [PATCH 28/32] Upstream to 3.8.3 --- .gitignore | 1 + activemq-cpp.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 44f5c0d..e48eb12 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ activemq-cpp-library-3.2.1-src.tar.gz /activemq-cpp-library-3.4.4-src.tar.gz /activemq-cpp-library-3.7.1-src.tar.gz /activemq-cpp-library-3.8.2-src.tar.gz +/activemq-cpp-library-3.8.3-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 4b0573c..fe241a8 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,14 +1,14 @@ %global with_docs 0 Name: activemq-cpp -Version: 3.8.2 -Release: 4%{?dist} +Version: 3.8.3 +Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries License: ASL 2.0 URL: http://activemq.apache.org/cms/ -Source0: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{version}-src.tar.gz +Source0: http://www.apache.org/dist/activemq/activemq-cpp/%{version}/activemq-cpp-library-%{version}-src.tar.gz Patch0: activemq-cpp-3.8.2-system-zlib.patch # Some local texmf configuration to increase default pool_size. Patch1: activemq-cpp-local-texmf.patch @@ -142,6 +142,9 @@ make %{?_smp_mflags} check %endif %changelog +* Wed Aug 27 2014 Steve Traylen - 3.8.4-1 +- Upstream to 3.8.3 + * Fri Aug 15 2014 Fedora Release Engineering - 3.8.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 46e44c6..c2c7455 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b853f5f866ea21a9a58564c7a2b8e59 activemq-cpp-library-3.8.2-src.tar.gz +065a9ea9b279e512cd96a985869bd697 activemq-cpp-library-3.8.3-src.tar.gz From 9ca450d322809f9468f05cf32277eee5d83eb21e Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 16 Feb 2017 10:30:47 +0100 Subject: [PATCH 29/32] Upstream to 3.9.3 Add activemqcpp-lib3.8 package to provide old version so. --- .gitignore | 2 ++ activemq-cpp.spec | 65 +++++++++++++++++++++++++++++++++++++++++------ sources | 1 + 3 files changed, 60 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index e48eb12..c303216 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ activemq-cpp-library-3.2.1-src.tar.gz /activemq-cpp-library-3.7.1-src.tar.gz /activemq-cpp-library-3.8.2-src.tar.gz /activemq-cpp-library-3.8.3-src.tar.gz +/activemq-cpp-library-3.9.3-src.tar.bz2.asc +/activemq-cpp-library-3.9.3-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index fe241a8..7a5c9c5 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,18 +1,22 @@ %global with_docs 0 +%global globalversion 3.9.3 +%global globalrelease 2 + Name: activemq-cpp -Version: 3.8.3 -Release: 1%{?dist} +Version: %{globalversion} +Release: %{globalrelease}%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries License: ASL 2.0 URL: http://activemq.apache.org/cms/ -Source0: http://www.apache.org/dist/activemq/activemq-cpp/%{version}/activemq-cpp-library-%{version}-src.tar.gz +Source0: http://www.apache.org/dist/activemq/activemq-cpp/%{globalversion}/activemq-cpp-library-%{globalversion}-src.tar.gz +Source1: http://www.apache.org/dist/activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.tar.gz Patch0: activemq-cpp-3.8.2-system-zlib.patch # Some local texmf configuration to increase default pool_size. Patch1: activemq-cpp-local-texmf.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{globalversion}-%{globalrelease}-root-%(%{__id_u} -n) BuildRequires: openssl-devel BuildRequires: zlib-devel @@ -45,7 +49,7 @@ ActiveMQ is still needed for your clients to communicate. %package devel Summary: C++ implementation header files for JMS-like messaging Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{globalversion}-%{globalrelease} Requires: pkgconfig %if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 Requires: libuuid-devel%{?_isa} @@ -82,8 +86,28 @@ for your clients to communicate. %{name}-doc contains api documentation. %endif +%package -n activemq-cpp3.8 +Version: 3.8.3 +Release: %{globalrelease}%{?dist} +Summary: C++ implementation of JMS-like messaging client + +%description -n activemq-cpp3.8 +activemq-cpp is a JMS-like API for C++ for interfacing with Message +Brokers such as Apache ActiveMQ. C++ messaging service helps to make your +C++ client code much neater and easier to follow. To get a better feel for +CMS try the API Reference. +ActiveMQ-CPP is a client only library, a message broker such as Apache +ActiveMQ is still needed for your clients to communicate. + %prep -%setup -q -n activemq-cpp-library-%{version} +%setup -q -n activemq-cpp-library-3.9.3 -a 1 +pushd activemq-cpp-library-3.8.3 +%patch0 -p1 +rm -r src/main/decaf/internal/util/zip +chmod 644 LICENSE.txt +chmod 644 src/main/activemq/transport/mock/MockTransport.cpp +popd + %patch0 -p1 rm -r src/main/decaf/internal/util/zip %if %{?with_docs}0 @@ -94,6 +118,11 @@ chmod 644 src/main/activemq/transport/mock/MockTransport.cpp %build +pushd activemq-cpp-library-3.8.3 +%configure --disable-static +make %{?_smp_mflags} +popd + # Build pdf(30MB) rather than default html(400MB). %if %{?with_docs}0 %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf @@ -110,6 +139,17 @@ make %{?_smp_mflags} doxygen-pdf %install rm -rf $RPM_BUILD_ROOT +pushd activemq-cpp-library-3.8.3 +make install DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la +rm $RPM_BUILD_ROOT/%{_bindir}/example +# Remove devel from compat. +rm $RPM_BUILD_ROOT/%{_bindir}/activemqcpp-config +rm -rf $RPM_BUILD_ROOT/%{_includedir}/activemq-cpp-3.8.3 +rm $RPM_BUILD_ROOT/%{_libdir}/libactivemq-cpp.so +rm $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/activemq-cpp.pc +popd + make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la rm $RPM_BUILD_ROOT/%{_bindir}/example @@ -125,13 +165,13 @@ make %{?_smp_mflags} check %files %defattr(-,root,root,-) -%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}.so.19* %doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt %files devel %defattr(-,root,root,-) %{_libdir}/lib%{name}.so -%{_includedir}/%{name}-%{version} +%{_includedir}/%{name}-%{globalversion} %{_libdir}/pkgconfig/%{name}.pc %{_bindir}/activemqcpp-config @@ -141,7 +181,16 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %endif +%files -n activemq-cpp3.8 +%{_libdir}/lib%{name}.so.18* +%doc LICENSE.txt + + %changelog +* Tue Feb 15 2017 Steve Traylen - 3.9.3-1 +- Upstream to 3.9.3 +- Add activemqcpp-lib3.8 package to provide old version so. + * Wed Aug 27 2014 Steve Traylen - 3.8.4-1 - Upstream to 3.8.3 diff --git a/sources b/sources index c2c7455..2b1bd76 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 065a9ea9b279e512cd96a985869bd697 activemq-cpp-library-3.8.3-src.tar.gz +SHA512 (activemq-cpp-library-3.9.3-src.tar.gz) = 56efa04abd4bfb9f5df592326f1cdd3d1adfe1ba6e5310d73c72d89e9c64b0d1ab9bcfab3bd91f9ebc6446774e6cb65c038efe36987ff41b2d9d6a0ff81eea20 From 2c802ad4e7cc70c5cd55f11a03f7c01ef333d5e1 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 16 Feb 2017 10:33:35 +0100 Subject: [PATCH 30/32] Correct day of week --- activemq-cpp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 7a5c9c5..bd50052 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -187,7 +187,7 @@ make %{?_smp_mflags} check %changelog -* Tue Feb 15 2017 Steve Traylen - 3.9.3-1 +* Wed Feb 15 2017 Steve Traylen - 3.9.3-1 - Upstream to 3.9.3 - Add activemqcpp-lib3.8 package to provide old version so. From d42508d00386abeaf6e2f91b7946d324d402db70 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 16 Feb 2017 10:41:35 +0100 Subject: [PATCH 31/32] Use SHA2 of sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 2b1bd76..90f82de 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -065a9ea9b279e512cd96a985869bd697 activemq-cpp-library-3.8.3-src.tar.gz +SHA512 (activemq-cpp-library-3.8.3-src.tar.gz) = 204a4e484af5f7ec0615084c0d0ad272ebf89751d2bd4bcf8b56930c39cc7376534a3b284a7cfd6467bd8223a757961a696e2c92af2dc6cc08fe60144dfc250c SHA512 (activemq-cpp-library-3.9.3-src.tar.gz) = 56efa04abd4bfb9f5df592326f1cdd3d1adfe1ba6e5310d73c72d89e9c64b0d1ab9bcfab3bd91f9ebc6446774e6cb65c038efe36987ff41b2d9d6a0ff81eea20 From d38ec44d5c95b0a8c2d01ccd1d76ef68692e2646 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 17 Feb 2017 16:50:53 +0100 Subject: [PATCH 32/32] Correct inter dependency. --- activemq-cpp.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index bd50052..0b96282 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,7 +1,7 @@ %global with_docs 0 %global globalversion 3.9.3 -%global globalrelease 2 +%global globalrelease 3 Name: activemq-cpp Version: %{globalversion} @@ -49,7 +49,7 @@ ActiveMQ is still needed for your clients to communicate. %package devel Summary: C++ implementation header files for JMS-like messaging Group: Development/Libraries -Requires: %{name} = %{globalversion}-%{globalrelease} +Requires: %{name} = %{globalversion}-%{globalrelease}%{?dist} Requires: pkgconfig %if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 Requires: libuuid-devel%{?_isa} @@ -187,7 +187,10 @@ make %{?_smp_mflags} check %changelog -* Wed Feb 15 2017 Steve Traylen - 3.9.3-1 +* Fri Feb 17 2017 Steve Traylen - 3.9.3-3 +- Correct inter dependecy. + +* Wed Feb 15 2017 Steve Traylen - 3.9.3-3 - Upstream to 3.9.3 - Add activemqcpp-lib3.8 package to provide old version so.