diff --git a/activemq-cpp.spec b/activemq-cpp.spec index ba34592..55fe92a 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,11 +1,15 @@ # 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 normalver 3.4.0 -%global normalrel 2%{?dist} -%global normalso 14 +%global normalver 3.7.1 +%global normalrel 1%{?dist} +%global normalso 17 +%global compattwover 3.4.0 +%global compattworel 1%{?dist} +%global compattwoso 14 %global compatver 3.2.5 -%global compatrel 3%{?dist} +%global compatrel 4%{?dist} %global compatso 12 Name: activemq-cpp @@ -18,6 +22,7 @@ License: ASL 2.0 URL: http://activemq.apache.org/cms/ Source0: http://www.apache.org/dist/activemq/activemq-cpp/source/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 # Some local texmf configuration to increase default pool_size. Patch1: %{name}-local-texmf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -103,15 +108,38 @@ 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: %{compattworel} +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. + + %prep #extract source1 as well 0 , the compat lib. -%setup -q -n activemq-cpp-library-%{normalver} -a 1 +%setup -q -n activemq-cpp-library-%{normalver} -a 1 -a 2 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 + %patch1 -p1 chmod 644 LICENSE.txt chmod 644 src/main/activemq/transport/mock/MockTransport.cpp @@ -122,6 +150,11 @@ 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 + # Build pdf(30MB) rather than default html(400MB). %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf make %{?_smp_mflags} @@ -144,6 +177,19 @@ 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 + + make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la rm $RPM_BUILD_ROOT/%{_bindir}/example @@ -179,7 +225,16 @@ make %{?_smp_mflags} check %doc LICENSE.txt +%files -n activemq-cpp%{compattwover}-compat +%defattr(-,root,root,-) +%{_libdir}/lib%{name}.so.%{compattwoso}* +%doc LICENSE.txt + %changelog +* 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. @@ -204,10 +259,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 b4121dc..bc2b675 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ 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