Correct inter dependency.

Use SHA2 of sources
Correct day of week
2017-02-17 16:50:53 +01:00 · 2017-02-16 10:41:35 +01:00 · 2017-02-16 10:33:35 +01:00 · 2017-02-16 10:30:47 +01:00
5 changed files with 190 additions and 94 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,6 +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.8.4-src.tar.gz
-/activemq-cpp-library-3.9.4-src.tar.gz
-/activemq-cpp-library-3.9.5-src.tar.gz
+/activemq-cpp-library-3.9.3-src.tar.bz2.asc
+/activemq-cpp-library-3.9.3-src.tar.gz
--- a/activemq-cpp-gcc47.patch
+++ b/activemq-cpp-gcc47.patch
@ -0,0 +1,12 @@
+diff -uNr activemq-cpp-library-3.4.1.ORIG/src/main/decaf/util/AbstractQueue.h activemq-cpp-library-3.4.1/src/main/decaf/util/AbstractQueue.h
+--- activemq-cpp-library-3.4.1.ORIG/src/main/decaf/util/AbstractQueue.h	2012-02-19 21:37:49.536000023 +0100
+++ activemq-cpp-library-3.4.1/src/main/decaf/util/AbstractQueue.h	2012-02-19 21:38:56.722000023 +0100
+@@ -60,7 +60,7 @@
+          */
+         virtual bool add( const E& value ) {
+ 
+-            if( offer( value ) ) {
+            if( this->offer( value ) ) {
+                 return true;
+             }
+ 
--- a/activemq-cpp-local-texmf.patch
+++ 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
--- a/activemq-cpp.spec
+++ b/activemq-cpp.spec
@ -1,140 +1,200 @@
+%global with_docs 0
+
+%global globalversion 3.9.3
+%global globalrelease 3
+
 Name:           activemq-cpp
-Version:        3.9.5
-Release:        5%{?dist}
+Version:        %{globalversion}
+Release:        %{globalrelease}%{?dist}
 Summary:        C++ implementation of JMS-like messaging client

-License:        Apache-2.0
+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
-Patch:          activemq-cpp-3.8.2-system-zlib.patch
+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}-%{globalversion}-%{globalrelease}-root-%(%{__id_u} -n)

-BuildRequires:  gcc
-BuildRequires:  gcc-c++
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel
-BuildRequires:  apr-util-devel >= 1.3
-BuildRequires:  cppunit-devel >= 1.10.2
-BuildRequires:  libuuid-devel
+%if %{?with_docs}0
+BuildRequires:  doxygen
+BuildRequires:  graphviz
+%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
+
+%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.
+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
-Requires:       %{name} = %{version}-%{release}
+Group:          Development/Libraries
+Requires:       %{name} = %{globalversion}-%{globalrelease}%{?dist}
 Requires:       pkgconfig
-Requires:       libuuid-devel
+%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
+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.
+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.

+%if %{?with_docs}0
+%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.
+%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
-%autosetup -n activemq-cpp-library-%{version} -p1
+%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

-%configure --disable-static
+%patch0 -p1
+rm -r src/main/decaf/internal/util/zip
+%if %{?with_docs}0
+%patch1 -p1
+%endif
+chmod 644 LICENSE.txt
+chmod 644 src/main/activemq/transport/mock/MockTransport.cpp


 %build
-%make_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
+%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
-%make_install
-rm %{buildroot}%{_libdir}/lib%{name}.la
-rm %{buildroot}%{_bindir}/example
+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
+
+%clean
+rm -rf $RPM_BUILD_ROOT

 %check
-make check
-
-%ldconfig_scriptlets
+make %{?_smp_mflags} check

+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig

 %files
-%{_libdir}/lib%{name}.so.*
-%license LICENSE.txt
-%doc NOTICE.txt README.txt RELEASE_NOTES.txt
-
+%defattr(-,root,root,-)
+%{_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

+%if %{?with_docs}0
+%files doc
+%defattr(-,root,root,-)
+%doc doc/%{name}.pdf
+%endif
+
+%files -n activemq-cpp3.8
+%{_libdir}/lib%{name}.so.18*
+%doc LICENSE.txt
+

 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+* Fri Feb 17 2017 Steve Traylen <steve.traylen@cern.ch> - 3.9.3-3
+- Correct inter dependecy.

-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.5-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+* Wed Feb 15 2017 Steve Traylen <steve.traylen@cern.ch> - 3.9.3-3
+- Upstream to 3.9.3
+- Add activemqcpp-lib3.8 package to provide old version so.

-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Wed Apr 03 2024 Jonathan Wright <jonathan@almalinux.org> - 3.9.5-1
- Unorphan package
- Update to 3.9.5
- Overhaul spec file
-
-* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Apr 13 2018 Steve Traylen <steve.traylen@cern.ch> - 3.9.4-1
- New from upstream
- Add patch for openssl1
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.8.4-2
- Rebuilt for GCC 5 C++11 ABI change
-
-* Wed Mar 11 2015 Steve Traylen <steve.traylen@cern.ch> - 3.8.4-1
- Upstream to 3.8.4
-
-* Wed Aug 27 2014 Steve Traylen <steve.traylen@cern.ch> - 3.8.3-1
+* Wed Aug 27 2014 Steve Traylen <steve.traylen@cern.ch> - 3.8.4-1
 - Upstream to 3.8.3

 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.2-4
--- a/3
+++ b/3
@ -1 +1,2 @@
-SHA512 (activemq-cpp-library-3.9.5-src.tar.gz) = 6481974f079b63f78fa9988726a544e86206c535066621068dae4e0856316219f92f4ead032431fa3d11a90e496e6d23b7f0f0183e44b4f51d47a98c82dc9078
+SHA512 (activemq-cpp-library-3.8.3-src.tar.gz) = 204a4e484af5f7ec0615084c0d0ad272ebf89751d2bd4bcf8b56930c39cc7376534a3b284a7cfd6467bd8223a757961a696e2c92af2dc6cc08fe60144dfc250c
+SHA512 (activemq-cpp-library-3.9.3-src.tar.gz) = 56efa04abd4bfb9f5df592326f1cdd3d1adfe1ba6e5310d73c72d89e9c64b0d1ab9bcfab3bd91f9ebc6446774e6cb65c038efe36987ff41b2d9d6a0ff81eea20
Author	SHA1	Message	Date
Steve Traylen	d38ec44d5c	Correct inter dependency.	2017-02-17 16:50:53 +01:00
Steve Traylen	d42508d003	Use SHA2 of sources	2017-02-16 10:41:35 +01:00
Steve Traylen	2c802ad4e7	Correct day of week	2017-02-16 10:33:35 +01:00
Steve Traylen	9ca450d322	Upstream to 3.9.3 Add activemqcpp-lib3.8 package to provide old version so.	2017-02-16 10:30:47 +01:00