From 6d88550d309f8fb40541467ef97934063e3c2cc2 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Mar 08 2011 17:32:01 +0000
Subject: Merge branch 'master' into el6


---

diff --git a/.gitignore b/.gitignore
index 801c845..7dc4fec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/activemq-cpp.spec b/activemq-cpp.spec
index 52a281e..afe613b 100644
--- a/activemq-cpp.spec
+++ b/activemq-cpp.spec
@@ -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
 
diff --git a/sources b/sources
index a7ec911..dc6fa55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f4a3db74eeb874aee925714bcb3c2c84  activemq-cpp-library-3.2.3-src.tar.gz
+47341f057cee34997ca826f526e3f681  activemq-cpp-library-3.2.5-src.tar.gz