Upstream to 3.9.3

Add activemqcpp-lib3.8 package to provide old version so.

.gitignore

@@ -9,3 +9,5 @@ activemq-cpp-library-3.2.1-src.tar.gz
 /activemq-cpp-library-3.7.1-src.tar.gz
 /activemq-cpp-library-3.8.2-src.tar.gz
 /activemq-cpp-library-3.8.3-src.tar.gz
+/activemq-cpp-library-3.9.3-src.tar.bz2.asc
+/activemq-cpp-library-3.9.3-src.tar.gz

activemq-cpp.spec

@@ -1,18 +1,22 @@
 %global with_docs 0
 
+%global globalversion 3.9.3
+%global globalrelease 2
+
 Name:           activemq-cpp
-Version:        3.8.3
-Release:        1%{?dist}
+Version:        %{globalversion}
+Release:        %{globalrelease}%{?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/%{version}/activemq-cpp-library-%{version}-src.tar.gz
+Source0:        http://www.apache.org/dist/activemq/activemq-cpp/%{globalversion}/activemq-cpp-library-%{globalversion}-src.tar.gz
+Source1:        http://www.apache.org/dist/activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.tar.gz
 Patch0:         activemq-cpp-3.8.2-system-zlib.patch
 # Some local texmf configuration to increase default pool_size.
 Patch1:         activemq-cpp-local-texmf.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{globalversion}-%{globalrelease}-root-%(%{__id_u} -n)
 
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
@@ -45,7 +49,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} = %{globalversion}-%{globalrelease}
 Requires:       pkgconfig
 %if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
 Requires:  libuuid-devel%{?_isa}
@@ -82,8 +86,28 @@ for your clients to communicate.
 %{name}-doc contains api documentation.
 %endif
 
+%package -n activemq-cpp3.8
+Version: 3.8.3
+Release: %{globalrelease}%{?dist}
+Summary: C++ implementation of JMS-like messaging client
+
+%description -n activemq-cpp3.8
+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.  
+
 %prep
-%setup -q -n activemq-cpp-library-%{version}
+%setup -q -n activemq-cpp-library-3.9.3 -a 1
+pushd activemq-cpp-library-3.8.3
+%patch0 -p1
+rm -r src/main/decaf/internal/util/zip
+chmod 644 LICENSE.txt
+chmod 644 src/main/activemq/transport/mock/MockTransport.cpp
+popd
+
 %patch0 -p1
 rm -r src/main/decaf/internal/util/zip
 %if %{?with_docs}0
@@ -94,6 +118,11 @@ chmod 644 src/main/activemq/transport/mock/MockTransport.cpp
 
 
 %build
+pushd activemq-cpp-library-3.8.3
+%configure --disable-static
+make %{?_smp_mflags}
+popd
+
 # Build pdf(30MB) rather than default html(400MB). 
 %if %{?with_docs}0
 %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf
@@ -110,6 +139,17 @@ make %{?_smp_mflags} doxygen-pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
+pushd activemq-cpp-library-3.8.3
+make install DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la
+rm $RPM_BUILD_ROOT/%{_bindir}/example
+# Remove devel from compat.
+rm $RPM_BUILD_ROOT/%{_bindir}/activemqcpp-config
+rm -rf $RPM_BUILD_ROOT/%{_includedir}/activemq-cpp-3.8.3
+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
@@ -125,13 +165,13 @@ make %{?_smp_mflags} check
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/lib%{name}.so.*
+%{_libdir}/lib%{name}.so.19*
 %doc LICENSE.txt  NOTICE.txt  README.txt  RELEASE_NOTES.txt
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib%{name}.so
-%{_includedir}/%{name}-%{version}
+%{_includedir}/%{name}-%{globalversion}
 %{_libdir}/pkgconfig/%{name}.pc
 %{_bindir}/activemqcpp-config
 
@@ -141,7 +181,16 @@ make %{?_smp_mflags} check
 %doc doc/%{name}.pdf
 %endif
 
+%files -n activemq-cpp3.8
+%{_libdir}/lib%{name}.so.18*
+%doc LICENSE.txt
+
+
 %changelog
+* Tue Feb 15 2017 Steve Traylen <steve.traylen@cern.ch> - 3.9.3-1
+- Upstream to 3.9.3
+- Add activemqcpp-lib3.8 package to provide old version so.
+
 * Wed Aug 27 2014 Steve Traylen <steve.traylen@cern.ch> - 3.8.4-1
 - Upstream to 3.8.3
 

sources

@@ -1 +1,2 @@
 065a9ea9b279e512cd96a985869bd697  activemq-cpp-library-3.8.3-src.tar.gz
+SHA512 (activemq-cpp-library-3.9.3-src.tar.gz) = 56efa04abd4bfb9f5df592326f1cdd3d1adfe1ba6e5310d73c72d89e9c64b0d1ab9bcfab3bd91f9ebc6446774e6cb65c038efe36987ff41b2d9d6a0ff81eea20