diff --git a/.gitignore b/.gitignore index 7dc4fec..712296a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,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 +/activemq-cpp-library-3.8.3-src.tar.gz diff --git a/activemq-cpp.spec b/activemq-cpp.spec index afe613b..ce783fc 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,12 +1,35 @@ + +# The normal* variables refer to the standard packaging. +# The compattwo* variables refer to a newer compat packages. +# The compat* variables refer to the compat packages. +%global globrelease 6 + +%global normalver 3.8.3 +%global normalso 18 + +%global compatver 3.2.5 +%global compatso 12 + +%global compattwover 3.4.0 +%global compattwoso 14 + +%global compatthreever 3.7.1 +%global compatthreeso 17 + + + Name: activemq-cpp -Version: 3.2.5 -Release: 1%{?dist} +Version: %{normalver} +Release: %{globrelease}%{?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 +Source0: http://www.apache.org/dist/activemq/activemq-cpp/%{normalver}/activemq-cpp-library-%{normalver}-src.tar.gz +Source1: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{compatver}-src.tar.gz +Source2: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{compattwover}-src.tar.gz +Source3: http://www.apache.org/dist/activemq/activemq-cpp/source/activemq-cpp-library-%{compatthreever}-src.tar.gz # Some local texmf configuration to increase default pool_size. Patch1: %{name}-local-texmf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,7 +63,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} = %{normalver}-%{globrelease}%{?dist} Requires: pkgconfig %if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 Requires: libuuid-devel%{?_isa} @@ -48,9 +71,6 @@ Requires: libuuid-devel%{?_isa} 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 @@ -79,14 +99,98 @@ for your clients to communicate. %{name}-doc contains api documentation. +%package compat +Version: %{compatver} +Release: %{globrelease}%{?dist} +Summary: C++ implementation of JMS-like messaging client +Group: Development/Libraries + +%description compat +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. + +This package contains activemq-cpp libraries for applications to bind to. + +%package -n activemq-cpp%{compattwover}-compat +Version: %{compattwover} +Release: %{globrelease}%{?dist} +Summary: C++ implementation of JMS-like messaging client +Group: Development/Libraries + +%description -n activemq-cpp%{compattwover}-compat +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. + +This package contains activemq-cpp libraries for applications to bind to. + +%package -n activemq-cpp%{compatthreever}-compat +Version: %{compatthreever} +Release: %{globrelease}%{?dist} +Summary: C++ implementation of JMS-like messaging client +Group: Development/Libraries + +%description -n activemq-cpp%{compatthreever}-compat +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. + +This package contains activemq-cpp libraries for applications to bind to. + + %prep -%setup -q -n activemq-cpp-library-%{version} +#extract source1 as well 0 , the compat lib. +%setup -q -n activemq-cpp-library-%{normalver} -a 1 -a 2 -a 3 +pushd activemq-cpp-library-%{compatver} +%patch1 -p1 +chmod 644 LICENSE.txt +chmod 644 src/main/activemq/transport/mock/MockTransport.cpp +popd +pushd activemq-cpp-library-%{compattwover} +%patch1 -p1 +chmod 644 LICENSE.txt +chmod 644 src/main/activemq/transport/mock/MockTransport.cpp +popd + +pushd activemq-cpp-library-%{compatthreever} +%patch1 -p1 +chmod 644 LICENSE.txt +chmod 644 src/main/activemq/transport/mock/MockTransport.cpp +popd + + %patch1 -p1 chmod 644 LICENSE.txt chmod 644 src/main/activemq/transport/mock/MockTransport.cpp %build +pushd activemq-cpp-library-%{compatver} +%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf +make %{?_smp_mflags} +popd +pushd activemq-cpp-library-%{compattwover} +%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf +make %{?_smp_mflags} +popd + +pushd activemq-cpp-library-%{compatthreever} +%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf +make %{?_smp_mflags} +popd + + + # Build pdf(30MB) rather than default html(400MB). %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf make %{?_smp_mflags} @@ -97,6 +201,43 @@ make %{?_smp_mflags} doxygen-pdf %install rm -rf $RPM_BUILD_ROOT +pushd activemq-cpp-library-%{compatver} +make install DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la +rm $RPM_BUILD_ROOT/%{_bindir}/example +# Remove the devel files from the compat package +# we only one the runtime stuff. +rm $RPM_BUILD_ROOT/%{_bindir}/activemqcpp-config +rm -rf $RPM_BUILD_ROOT/%{_includedir}/activemq-cpp-%{compatver} +rm $RPM_BUILD_ROOT/%{_libdir}/libactivemq-cpp.so +rm $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/activemq-cpp.pc +popd + +pushd activemq-cpp-library-%{compattwover} +make install DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la +rm $RPM_BUILD_ROOT/%{_bindir}/example +# Remove the devel files from the compat package +# we only one the runtime stuff. +rm $RPM_BUILD_ROOT/%{_bindir}/activemqcpp-config +rm -rf $RPM_BUILD_ROOT/%{_includedir}/activemq-cpp-%{compattwover} +rm $RPM_BUILD_ROOT/%{_libdir}/libactivemq-cpp.so +rm $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/activemq-cpp.pc +popd + +pushd activemq-cpp-library-%{compatthreever} +make install DESTDIR=$RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la +rm $RPM_BUILD_ROOT/%{_bindir}/example +# Remove the devel files from the compat package +# we only one the runtime stuff. +rm $RPM_BUILD_ROOT/%{_bindir}/activemqcpp-config +rm -rf $RPM_BUILD_ROOT/%{_includedir}/activemq-cpp-%{compatthreever} +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 @@ -112,13 +253,13 @@ make %{?_smp_mflags} check %files %defattr(-,root,root,-) -%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}.so.%{normalso}* %doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt %files devel %defattr(-,root,root,-) %{_libdir}/lib%{name}.so -%{_includedir}/%{name}-%{version} +%{_includedir}/%{name}-%{normalver} %{_libdir}/pkgconfig/%{name}.pc %{_bindir}/activemqcpp-config @@ -126,7 +267,42 @@ make %{?_smp_mflags} check %defattr(-,root,root,-) %doc doc/%{name}.pdf +%files compat +%defattr(-,root,root,-) +%{_libdir}/lib%{name}.so.%{compatso}* +%doc LICENSE.txt + + +%files -n activemq-cpp%{compattwover}-compat +%defattr(-,root,root,-) +%{_libdir}/lib%{name}.so.%{compattwoso}* +%doc LICENSE.txt + +%files -n activemq-cpp%{compatthreever}-compat +%defattr(-,root,root,-) +%{_libdir}/lib%{name}.so.%{compatthreeso}* +%doc LICENSE.txt + + %changelog +* Wed Aug 27 2014 Steve Traylen - 3.8.3-6 +- Upstream to 3.8.3 +- Source URL changed. + +* Sat Oct 29 2011 Steve Traylen - 3.8.2-5 +- Upstream to 3.8.2 +- Add another compat package activemq-cpp3.7.0-compat + +* Sat Oct 29 2011 Steve Traylen - 3.7.0-1 +- Upstream to 3.7.0 +- Add another compat activemq-cpp3.4.0-compat package. + +* Sat Oct 29 2011 Steve Traylen - 3.4.0-2 +- Fix rhbz#757629 and bump 3.2.5-3 compat package. + +* Sat Oct 29 2011 Steve Traylen - 3.4.0-1 +- Upstream to 3.4.0 and add a 3.2.5-2 compat package. + * Mon Mar 7 2011 Steve Traylen - 3.2.5-1 - autoconf step removed. - Upstream to 3.2.5 @@ -145,10 +321,10 @@ make %{?_smp_mflags} check - Add BR of openssl-devel since library now supports ssl connections. -* Fri Apr 3 2010 Steve Traylen - 3.1.2-1 +* Sat Apr 3 2010 Steve Traylen - 3.1.2-1 - Upstream to 3.1.2 -* Tue Jan 9 2010 Steve Traylen - 3.1.0-1 +* Sat Jan 9 2010 Steve Traylen - 3.1.0-1 - Upstream to 3.1.0 * Fri Dec 11 2009 Steve Traylen - 3.0.1-1 diff --git a/sources b/sources index dc6fa55..0e497bf 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ 47341f057cee34997ca826f526e3f681 activemq-cpp-library-3.2.5-src.tar.gz +1e476bb5e8b98d095c0ac917ebd31026 activemq-cpp-library-3.4.0-src.tar.gz +2a577ef3f900bd2735a32398366088ff activemq-cpp-library-3.7.1-src.tar.gz +065a9ea9b279e512cd96a985869bd697 activemq-cpp-library-3.8.3-src.tar.gz