From d5a7d6e51b945112567c08b470546d2d14e7f303 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 14 Dec 2009 17:28:25 +0000 Subject: [PATCH 1/4] Initialize branch F-12 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..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From d05fe1a2db732ef90d25196a59599e7f9ce9836e Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Mon, 14 Dec 2009 18:55:19 +0000 Subject: [PATCH 2/4] 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 21666b82d3f210394bc16cd08a8ae550bb120fae Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Tue, 15 Dec 2009 14:58:38 +0000 Subject: [PATCH 3/4] 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 71f979e38d72f0d0e5f488235ac730012765645d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:35:26 +0000 Subject: [PATCH 4/4] 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 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12