Merge branch 'master' into el6

This commit is contained in:
Steve Traylen 2011-03-08 18:32:01 +01:00
commit 6d88550d30
3 changed files with 14 additions and 6 deletions

2
.gitignore vendored
View file

@ -1,2 +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

View file

@ -1,5 +1,5 @@
Name: activemq-cpp
Version: 3.2.3
Version: 3.2.5
Release: 1%{?dist}
Summary: C++ implementation of JMS-like messaging client
@ -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}
@ -131,6 +127,16 @@ make %{?_smp_mflags} check
%doc doc/%{name}.pdf
%changelog
* Mon Mar 7 2011 Steve Traylen <steve.traylen@cern.ch> - 3.2.5-1
- autoconf step removed.
- Upstream to 3.2.5
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Sun Feb 6 2011 Steve Traylen <steve.traylen@cern.ch> - 3.2.4-1
- Upstream to 3.2.4
* Wed Nov 10 2010 Steve Traylen <steve.traylen@cern.ch> - 3.2.3-1
- Upstream to 3.2.3

View file

@ -1 +1 @@
f4a3db74eeb874aee925714bcb3c2c84 activemq-cpp-library-3.2.3-src.tar.gz
47341f057cee34997ca826f526e3f681 activemq-cpp-library-3.2.5-src.tar.gz