diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 55fe92a..a4fc3f8 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -2,19 +2,25 @@ # 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.7.1 -%global normalrel 1%{?dist} -%global normalso 17 -%global compattwover 3.4.0 -%global compattworel 1%{?dist} -%global compattwoso 14 +%global globrelease 5 + +%global normalver 3.8.2 +%global normalso 18 + %global compatver 3.2.5 -%global compatrel 4%{?dist} %global compatso 12 +%global compattwover 3.4.0 +%global compattwoso 14 + +%global compatthreever 3.7.1 +%global compatthreeso 17 + + + Name: activemq-cpp Version: %{normalver} -Release: %{normalrel} +Release: %{globrelease}%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -23,6 +29,7 @@ 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 +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) @@ -56,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} = %{normalver}-%{normalrel} +Requires: %{name} = %{normalver}-%{globrelease}%{?dist} Requires: pkgconfig %if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 Requires: libuuid-devel%{?_isa} @@ -94,7 +101,7 @@ for your clients to communicate. %package compat Version: %{compatver} -Release: %{compatrel} +Release: %{globrelease}%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -110,7 +117,7 @@ This package contains activemq-cpp libraries for applications to bind to. %package -n activemq-cpp%{compattwover}-compat Version: %{compattwover} -Release: %{compattworel} +Release: %{globrelease}%{?dist} Summary: C++ implementation of JMS-like messaging client Group: Development/Libraries @@ -124,11 +131,26 @@ 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 #extract source1 as well 0 , the compat lib. -%setup -q -n activemq-cpp-library-%{normalver} -a 1 -a 2 +%setup -q -n activemq-cpp-library-%{normalver} -a 1 -a 2 -a 3 pushd activemq-cpp-library-%{compatver} %patch1 -p1 chmod 644 LICENSE.txt @@ -140,6 +162,13 @@ 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 @@ -155,6 +184,13 @@ pushd activemq-cpp-library-%{compattwover} 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} @@ -189,6 +225,18 @@ 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 @@ -230,7 +278,17 @@ make %{?_smp_mflags} check %{_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 +* 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. diff --git a/sources b/sources index bc2b675..d56b5da 100644 --- a/sources +++ b/sources @@ -1,3 +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 +5b853f5f866ea21a9a58564c7a2b8e59 activemq-cpp-library-3.8.2-src.tar.gz