From 74c574d55530c715aa714aa0bc238f79fb35df86 Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Mon, 14 Dec 2009 18:55:19 +0000 Subject: [PATCH 01/13] First versions. --- activemq-cpp-local-texmf.patch | 24 ++++++ activemq-cpp.spec | 145 +++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 170 insertions(+) create mode 100644 activemq-cpp-local-texmf.patch create mode 100644 activemq-cpp.spec 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/sources b/sources index e69de29..0ea5cd6 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +1222f0d6c5f86ef3ed5a558a533c7564 activemq-cpp-2.2.6-src.tar.gz From c0e9996ff5740c525757625633bf83f4d218ed68 Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Tue, 15 Dec 2009 14:58:38 +0000 Subject: [PATCH 02/13] Upstream to 3.0.1 --- activemq-cpp.spec | 15 +++++++++------ sources | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) 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 b3691ff9fb23f8c0a2c68a233f55b5302515f771 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:48:27 +0000 Subject: [PATCH 03/13] Initialize branch EL-6 for activemq-cpp --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From 13671a5e19153b84009f1a2b6479f0a8c5175b4e Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Mon, 10 May 2010 11:08:42 +0000 Subject: [PATCH 04/13] Upstream to 3.1.2. --- activemq-cpp.spec | 13 ++++++++++++- sources | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index b3082bc..1d0e047 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,5 +1,5 @@ Name: activemq-cpp -Version: 3.0.1 +Version: 3.1.2 Release: 1%{?dist} Summary: C++ implementation of JMS-like messaging client @@ -130,18 +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 e38bf34..4a6e463 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b917d8a27841e9ab0aeeb2297f771447 activemq-cpp-library-3.0.1-src.tar.gz +a553210201d97a9ff76762bdfe548c29 activemq-cpp-library-3.1.2-src.tar.gz From e1112e75e5557f17a80db7cb2c1b0ed701f918ec Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Thu, 22 Jul 2010 12:42:34 +0000 Subject: [PATCH 05/13] Update 3.2.1 --- .cvsignore | 1 + activemq-cpp.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index e69de29..594114c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +activemq-cpp-library-3.2.1-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 1d0e047..726b2d7 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 @@ -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 @@ -130,6 +131,11 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %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 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 51debe902d96c425de6861c2838cbf01b4d01606 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:35:27 +0000 Subject: [PATCH 06/13] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 From fb43b119499c3390956b9eb75efe501d6484592f Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Sat, 29 Oct 2011 19:25:51 +0200 Subject: [PATCH 07/13] Upstream to 3.4.0 and add a 3.2.5-2 compat package. --- activemq-cpp.spec | 76 ++++++++++++++++++++++++++++++++++++++++------- sources | 1 + 2 files changed, 67 insertions(+), 10 deletions(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index afe613b..e657d5b 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,12 +1,23 @@ + +# The normal* variables refer to the standard packaging. +# The compat* variables refer to the compat packages. +%global normalver 3.4.0 +%global normalrel 1 +%global normalso 14 +%global compatver 3.2.5 +%global compatrel 2 +%global compatso 12 + Name: activemq-cpp -Version: 3.2.5 -Release: 1%{?dist} +Version: %{normalver} +Release: %{normalrel}%{?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/source/activemq-cpp-library-%{normalver}-src.tar.gz +Source1: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{compatver}-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) @@ -40,7 +51,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} = %{normalver}-%{normalrel} Requires: pkgconfig %if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 Requires: libuuid-devel%{?_isa} @@ -48,9 +59,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 @@ -79,14 +87,41 @@ for your clients to communicate. %{name}-doc contains api documentation. +%package compat +Version: %{compatver} +Release: %{compatrel}%{?dist} +Summary: C++ implementation of JMS-like messaging client +Group: Development/Libraries + +%description compat +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. + +This package contains activemq-cpp libraries for applications to bind to. + + %prep -%setup -q -n activemq-cpp-library-%{version} +#extract source1 as well 0 , the compat lib. +%setup -q -n activemq-cpp-library-%{normalver} -a 1 +pushd activemq-cpp-library-%{compatver} +%patch1 -p1 +chmod 644 LICENSE.txt +chmod 644 src/main/activemq/transport/mock/MockTransport.cpp +popd %patch1 -p1 chmod 644 LICENSE.txt chmod 644 src/main/activemq/transport/mock/MockTransport.cpp %build +pushd activemq-cpp-library-%{compatver} +%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf +make %{?_smp_mflags} +popd # Build pdf(30MB) rather than default html(400MB). %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf make %{?_smp_mflags} @@ -97,6 +132,18 @@ make %{?_smp_mflags} doxygen-pdf %install rm -rf $RPM_BUILD_ROOT +pushd activemq-cpp-library-%{compatver} +make install DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la +rm $RPM_BUILD_ROOT/%{_bindir}/example +# Remove the devel files from the compat package +# we only one the runtime stuff. +rm $RPM_BUILD_ROOT/%{_bindir}/activemqcpp-config +rm -rf $RPM_BUILD_ROOT/%{_includedir}/activemq-cpp-%{compatver} +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 @@ -112,13 +159,13 @@ make %{?_smp_mflags} check %files %defattr(-,root,root,-) -%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}.so.%{normalso}* %doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt %files devel %defattr(-,root,root,-) %{_libdir}/lib%{name}.so -%{_includedir}/%{name}-%{version} +%{_includedir}/%{name}-%{normalver} %{_libdir}/pkgconfig/%{name}.pc %{_bindir}/activemqcpp-config @@ -126,7 +173,16 @@ make %{?_smp_mflags} check %defattr(-,root,root,-) %doc doc/%{name}.pdf +%files compat +%defattr(-,root,root,-) +%{_libdir}/lib%{name}.so.%{compatso}* +%doc LICENSE.txt + + %changelog +* Sat Oct 29 2011 Steve Traylen - 3.4.0-1 +- Upstream to 3.4.0 and add a 3.2.5-2 compat package. + * 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..b4121dc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 47341f057cee34997ca826f526e3f681 activemq-cpp-library-3.2.5-src.tar.gz +1e476bb5e8b98d095c0ac917ebd31026 activemq-cpp-library-3.4.0-src.tar.gz From 411faca55279b588aa35c2b6d9e4ec1ce13b92f5 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Mon, 28 Nov 2011 21:23:50 +0100 Subject: [PATCH 08/13] Fix rhbz#757629 and bump 3.2.5-3 compat package. --- activemq-cpp.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index e657d5b..26b8e37 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,10 +2,10 @@ # The normal* variables refer to the standard packaging. # The compat* variables refer to the compat packages. %global normalver 3.4.0 -%global normalrel 1 +%global normalrel 2%{?dist} %global normalso 14 %global compatver 3.2.5 -%global compatrel 2 +%global compatrel 3%{?dist} %global compatso 12 Name: activemq-cpp @@ -89,7 +89,7 @@ for your clients to communicate. %package compat Version: %{compatver} -Release: %{compatrel}%{?dist} +Release: %{compatrel} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -180,6 +180,9 @@ make %{?_smp_mflags} check %changelog +* Sat Oct 29 2011 Steve Traylen - 3.4.0-2 +- Fix rhbz#757629 and bump 3.2.5-3 compat package. + * Sat Oct 29 2011 Steve Traylen - 3.4.0-1 - Upstream to 3.4.0 and add a 3.2.5-2 compat package. From fe4a1c8172dc785bd42b489cee7e50207ce12189 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Mon, 28 Nov 2011 21:26:59 +0100 Subject: [PATCH 09/13] Daft el6. --- activemq-cpp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 26b8e37..ba34592 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -10,7 +10,7 @@ Name: activemq-cpp Version: %{normalver} -Release: %{normalrel}%{?dist} +Release: %{normalrel} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries From d00e1fd082efa06ed42c7afc8e419fd663287df0 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 6 Sep 2013 14:28:43 +0000 Subject: [PATCH 10/13] Upstream to 3.7.0 Add another compat activemq-cpp3.4.0-compat package. --- activemq-cpp.spec | 69 ++++++++++++++++++++++++++++++++++++++++++----- sources | 1 + 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index ba34592..55fe92a 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,11 +1,15 @@ # The normal* variables refer to the standard packaging. +# The compattwo* variables refer to a newer compat packages. # The compat* variables refer to the compat packages. -%global normalver 3.4.0 -%global normalrel 2%{?dist} -%global normalso 14 +%global normalver 3.7.1 +%global normalrel 1%{?dist} +%global normalso 17 +%global compattwover 3.4.0 +%global compattworel 1%{?dist} +%global compattwoso 14 %global compatver 3.2.5 -%global compatrel 3%{?dist} +%global compatrel 4%{?dist} %global compatso 12 Name: activemq-cpp @@ -18,6 +22,7 @@ License: ASL 2.0 URL: http://activemq.apache.org/cms/ Source0: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{normalver}-src.tar.gz Source1: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{compatver}-src.tar.gz +Source2: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{compattwover}-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) @@ -103,15 +108,38 @@ ActiveMQ is still needed for your clients to communicate. This package contains activemq-cpp libraries for applications to bind to. +%package -n activemq-cpp%{compattwover}-compat +Version: %{compattwover} +Release: %{compattworel} +Summary: C++ implementation of JMS-like messaging client +Group: Development/Libraries + +%description -n activemq-cpp%{compattwover}-compat +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. + +This package contains activemq-cpp libraries for applications to bind to. + + %prep #extract source1 as well 0 , the compat lib. -%setup -q -n activemq-cpp-library-%{normalver} -a 1 +%setup -q -n activemq-cpp-library-%{normalver} -a 1 -a 2 pushd activemq-cpp-library-%{compatver} %patch1 -p1 chmod 644 LICENSE.txt chmod 644 src/main/activemq/transport/mock/MockTransport.cpp popd +pushd activemq-cpp-library-%{compattwover} +%patch1 -p1 +chmod 644 LICENSE.txt +chmod 644 src/main/activemq/transport/mock/MockTransport.cpp +popd + %patch1 -p1 chmod 644 LICENSE.txt chmod 644 src/main/activemq/transport/mock/MockTransport.cpp @@ -122,6 +150,11 @@ pushd activemq-cpp-library-%{compatver} %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf make %{?_smp_mflags} popd +pushd activemq-cpp-library-%{compattwover} +%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf +make %{?_smp_mflags} +popd + # Build pdf(30MB) rather than default html(400MB). %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf make %{?_smp_mflags} @@ -144,6 +177,19 @@ rm $RPM_BUILD_ROOT/%{_libdir}/libactivemq-cpp.so rm $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/activemq-cpp.pc popd +pushd activemq-cpp-library-%{compattwover} +make install DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la +rm $RPM_BUILD_ROOT/%{_bindir}/example +# Remove the devel files from the compat package +# we only one the runtime stuff. +rm $RPM_BUILD_ROOT/%{_bindir}/activemqcpp-config +rm -rf $RPM_BUILD_ROOT/%{_includedir}/activemq-cpp-%{compattwover} +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 @@ -179,7 +225,16 @@ make %{?_smp_mflags} check %doc LICENSE.txt +%files -n activemq-cpp%{compattwover}-compat +%defattr(-,root,root,-) +%{_libdir}/lib%{name}.so.%{compattwoso}* +%doc LICENSE.txt + %changelog +* Sat Oct 29 2011 Steve Traylen - 3.7.0-1 +- Upstream to 3.7.0 +- Add another compat activemq-cpp3.4.0-compat package. + * Sat Oct 29 2011 Steve Traylen - 3.4.0-2 - Fix rhbz#757629 and bump 3.2.5-3 compat package. @@ -204,10 +259,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 b4121dc..bc2b675 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 47341f057cee34997ca826f526e3f681 activemq-cpp-library-3.2.5-src.tar.gz 1e476bb5e8b98d095c0ac917ebd31026 activemq-cpp-library-3.4.0-src.tar.gz +2a577ef3f900bd2735a32398366088ff activemq-cpp-library-3.7.1-src.tar.gz From 3f87876617ec2d8aaf1736e8be2e0685040c1b39 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 30 Jan 2014 14:18:44 +0000 Subject: [PATCH 11/13] - Upstream to 3.8.2 - Add another compat package activemq-cpp3.7.0-compat --- activemq-cpp.spec | 82 ++++++++++++++++++++++++++++++++++++++++------- sources | 1 + 2 files changed, 71 insertions(+), 12 deletions(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 55fe92a..a4fc3f8 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,19 +2,25 @@ # The normal* variables refer to the standard packaging. # The compattwo* variables refer to a newer compat packages. # The compat* variables refer to the compat packages. -%global normalver 3.7.1 -%global normalrel 1%{?dist} -%global normalso 17 -%global compattwover 3.4.0 -%global compattworel 1%{?dist} -%global compattwoso 14 +%global globrelease 5 + +%global normalver 3.8.2 +%global normalso 18 + %global compatver 3.2.5 -%global compatrel 4%{?dist} %global compatso 12 +%global compattwover 3.4.0 +%global compattwoso 14 + +%global compatthreever 3.7.1 +%global compatthreeso 17 + + + Name: activemq-cpp Version: %{normalver} -Release: %{normalrel} +Release: %{globrelease}%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -23,6 +29,7 @@ URL: http://activemq.apache.org/cms/ Source0: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{normalver}-src.tar.gz Source1: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{compatver}-src.tar.gz Source2: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{compattwover}-src.tar.gz +Source3: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{compatthreever}-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) @@ -56,7 +63,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} = %{normalver}-%{normalrel} +Requires: %{name} = %{normalver}-%{globrelease}%{?dist} Requires: pkgconfig %if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 Requires: libuuid-devel%{?_isa} @@ -94,7 +101,7 @@ for your clients to communicate. %package compat Version: %{compatver} -Release: %{compatrel} +Release: %{globrelease}%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -110,7 +117,7 @@ This package contains activemq-cpp libraries for applications to bind to. %package -n activemq-cpp%{compattwover}-compat Version: %{compattwover} -Release: %{compattworel} +Release: %{globrelease}%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -124,11 +131,26 @@ ActiveMQ is still needed for your clients to communicate. This package contains activemq-cpp libraries for applications to bind to. +%package -n activemq-cpp%{compatthreever}-compat +Version: %{compatthreever} +Release: %{globrelease}%{?dist} +Summary: C++ implementation of JMS-like messaging client +Group: Development/Libraries + +%description -n activemq-cpp%{compatthreever}-compat +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. + +This package contains activemq-cpp libraries for applications to bind to. %prep #extract source1 as well 0 , the compat lib. -%setup -q -n activemq-cpp-library-%{normalver} -a 1 -a 2 +%setup -q -n activemq-cpp-library-%{normalver} -a 1 -a 2 -a 3 pushd activemq-cpp-library-%{compatver} %patch1 -p1 chmod 644 LICENSE.txt @@ -140,6 +162,13 @@ chmod 644 LICENSE.txt chmod 644 src/main/activemq/transport/mock/MockTransport.cpp popd +pushd activemq-cpp-library-%{compatthreever} +%patch1 -p1 +chmod 644 LICENSE.txt +chmod 644 src/main/activemq/transport/mock/MockTransport.cpp +popd + + %patch1 -p1 chmod 644 LICENSE.txt chmod 644 src/main/activemq/transport/mock/MockTransport.cpp @@ -155,6 +184,13 @@ pushd activemq-cpp-library-%{compattwover} make %{?_smp_mflags} popd +pushd activemq-cpp-library-%{compatthreever} +%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf +make %{?_smp_mflags} +popd + + + # Build pdf(30MB) rather than default html(400MB). %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf make %{?_smp_mflags} @@ -189,6 +225,18 @@ rm $RPM_BUILD_ROOT/%{_libdir}/libactivemq-cpp.so rm $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/activemq-cpp.pc popd +pushd activemq-cpp-library-%{compatthreever} +make install DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la +rm $RPM_BUILD_ROOT/%{_bindir}/example +# Remove the devel files from the compat package +# we only one the runtime stuff. +rm $RPM_BUILD_ROOT/%{_bindir}/activemqcpp-config +rm -rf $RPM_BUILD_ROOT/%{_includedir}/activemq-cpp-%{compatthreever} +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 @@ -230,7 +278,17 @@ make %{?_smp_mflags} check %{_libdir}/lib%{name}.so.%{compattwoso}* %doc LICENSE.txt +%files -n activemq-cpp%{compatthreever}-compat +%defattr(-,root,root,-) +%{_libdir}/lib%{name}.so.%{compatthreeso}* +%doc LICENSE.txt + + %changelog +* Sat Oct 29 2011 Steve Traylen - 3.8.2-5 +- Upstream to 3.8.2 +- Add another compat package activemq-cpp3.7.0-compat + * Sat Oct 29 2011 Steve Traylen - 3.7.0-1 - Upstream to 3.7.0 - Add another compat activemq-cpp3.4.0-compat package. diff --git a/sources b/sources index bc2b675..d56b5da 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ 47341f057cee34997ca826f526e3f681 activemq-cpp-library-3.2.5-src.tar.gz 1e476bb5e8b98d095c0ac917ebd31026 activemq-cpp-library-3.4.0-src.tar.gz 2a577ef3f900bd2735a32398366088ff activemq-cpp-library-3.7.1-src.tar.gz +5b853f5f866ea21a9a58564c7a2b8e59 activemq-cpp-library-3.8.2-src.tar.gz From 0e79cfb9f417a64669cf82367536c3ce193d4351 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 27 Aug 2014 14:02:31 +0000 Subject: [PATCH 12/13] Upstream to 3.8.3 --- .gitignore | 1 + activemq-cpp.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7dc4fec..712296a 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.8.3-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index a4fc3f8..5d1accd 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,9 +2,9 @@ # The normal* variables refer to the standard packaging. # The compattwo* variables refer to a newer compat packages. # The compat* variables refer to the compat packages. -%global globrelease 5 +%global globrelease 6 -%global normalver 3.8.2 +%global normalver 3.8.3 %global normalso 18 %global compatver 3.2.5 @@ -285,6 +285,9 @@ make %{?_smp_mflags} check %changelog +* Wed Aug 27 2014 Steve Traylen - 3.8.3-6 +- Upstream to 3.8.3 + * Sat Oct 29 2011 Steve Traylen - 3.8.2-5 - Upstream to 3.8.2 - Add another compat package activemq-cpp3.7.0-compat diff --git a/sources b/sources index d56b5da..0e497bf 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 47341f057cee34997ca826f526e3f681 activemq-cpp-library-3.2.5-src.tar.gz 1e476bb5e8b98d095c0ac917ebd31026 activemq-cpp-library-3.4.0-src.tar.gz 2a577ef3f900bd2735a32398366088ff activemq-cpp-library-3.7.1-src.tar.gz -5b853f5f866ea21a9a58564c7a2b8e59 activemq-cpp-library-3.8.2-src.tar.gz +065a9ea9b279e512cd96a985869bd697 activemq-cpp-library-3.8.3-src.tar.gz From 0402f450654af1847239f9cf1cc562d68c2fa590 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Wed, 27 Aug 2014 14:18:03 +0000 Subject: [PATCH 13/13] Source URL changed --- activemq-cpp.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 5d1accd..ce783fc 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -26,7 +26,7 @@ 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-%{normalver}-src.tar.gz +Source0: http://www.apache.org/dist/activemq/activemq-cpp/%{normalver}/activemq-cpp-library-%{normalver}-src.tar.gz Source1: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{compatver}-src.tar.gz Source2: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{compattwover}-src.tar.gz Source3: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{compatthreever}-src.tar.gz @@ -287,6 +287,7 @@ make %{?_smp_mflags} check %changelog * Wed Aug 27 2014 Steve Traylen - 3.8.3-6 - Upstream to 3.8.3 +- Source URL changed. * Sat Oct 29 2011 Steve Traylen - 3.8.2-5 - Upstream to 3.8.2