From 90bcef2579be35599bdf4a5238b52136bf68af07 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Sep 16 2012 13:43:22 +0000
Subject: Upstream to 3.4.4


---

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 <steve.traylen@cern.ch> - 3.4.4-1
+- Upstream to 3.4.4
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 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