[activemq-cpp/el6] Upstream to 3.4.0 and add a 3.2.5-2 compat package.
stevetraylen
stevetraylen at fedoraproject.org
Sat Oct 29 17:26:21 UTC 2011
commit fb43b119499c3390956b9eb75efe501d6484592f
Author: Steve Traylen <steve.traylen at cern.ch>
Date: Sat Oct 29 19:25:51 2011 +0200
Upstream to 3.4.0 and add a 3.2.5-2 compat package.
activemq-cpp.spec | 76 ++++++++++++++++++++++++++++++++++++++++++++++-------
sources | 1 +
2 files changed, 67 insertions(+), 10 deletions(-)
---
diff --git a/activemq-cpp.spec b/activemq-cpp.spec
index afe613b..e657d5b 100644
--- a/activemq-cpp.spec
+++ b/activemq-cpp.spec
@@ -1,12 +1,23 @@
+
+# The normal* variables refer to the standard packaging.
+# The compat* variables refer to the compat packages.
+%global normalver 3.4.0
+%global normalrel 1
+%global normalso 14
+%global compatver 3.2.5
+%global compatrel 2
+%global compatso 12
+
Name: activemq-cpp
-Version: 3.2.5
-Release: 1%{?dist}
+Version: %{normalver}
+Release: %{normalrel}%{?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/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
# 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 +51,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}-%{normalrel}
Requires: pkgconfig
%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
Requires: libuuid-devel%{?_isa}
@@ -48,9 +59,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 +87,41 @@ for your clients to communicate.
%{name}-doc contains api documentation.
+%package compat
+Version: %{compatver}
+Release: %{compatrel}%{?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.
+
+
%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
+pushd activemq-cpp-library-%{compatver}
+%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
# Build pdf(30MB) rather than default html(400MB).
%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf
make %{?_smp_mflags}
@@ -97,6 +132,18 @@ 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
+
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la
rm $RPM_BUILD_ROOT/%{_bindir}/example
@@ -112,13 +159,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 +173,16 @@ make %{?_smp_mflags} check
%defattr(-,root,root,-)
%doc doc/%{name}.pdf
+%files compat
+%defattr(-,root,root,-)
+%{_libdir}/lib%{name}.so.%{compatso}*
+%doc LICENSE.txt
+
+
%changelog
+* Sat Oct 29 2011 Steve Traylen <steve.traylen at cern.ch> - 3.4.0-1
+- Upstream to 3.4.0 and add a 3.2.5-2 compat package.
+
* Mon Mar 7 2011 Steve Traylen <steve.traylen at cern.ch> - 3.2.5-1
- autoconf step removed.
- Upstream to 3.2.5
diff --git a/sources b/sources
index dc6fa55..b4121dc 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
47341f057cee34997ca826f526e3f681 activemq-cpp-library-3.2.5-src.tar.gz
+1e476bb5e8b98d095c0ac917ebd31026 activemq-cpp-library-3.4.0-src.tar.gz
More information about the scm-commits
mailing list