Commit a010cd35 authored by Geoff Simmons's avatar Geoff Simmons

Package the ActiveMQ plugin for the tracking reader

- ActiveMQ client library no longer statically linked
  will now have to deployed again as package libactivemq-cpp6
- Message plugin implementation library packaged as libtrackrdr-activemq
  (distributes libtrackrdr-activemq.so)
- Package trackrdrd depends on libtrackrdr-activemq
- libtrackrdr-activemq depends on libactivemq-cpp6
parent a25392aa
...@@ -4,9 +4,6 @@ GLOBAL_STATUS=0 ...@@ -4,9 +4,6 @@ GLOBAL_STATUS=0
LHOTSE_VARNISH_PREFIX=/var/opt/varnish LHOTSE_VARNISH_PREFIX=/var/opt/varnish
LHOTSE_TRACKING_PREFIX=/var/opt/varnish_tracking LHOTSE_TRACKING_PREFIX=/var/opt/varnish_tracking
## required for static build
export AMQ_LIBS=" -lpthread -ldl -luuid -lssl -lstdc++ -lapr-1 /usr/lib64/libactivemq-cpp.a "
if [ ! -d "$WORKSPACE/lhotse-varnish-cache" ]; then if [ ! -d "$WORKSPACE/lhotse-varnish-cache" ]; then
git clone git@git.lhotse.ov.otto.de:lhotse-varnish-cache git clone git@git.lhotse.ov.otto.de:lhotse-varnish-cache
fi fi
......
...@@ -16,7 +16,7 @@ AutoReqProv: no ...@@ -16,7 +16,7 @@ AutoReqProv: no
%if "%{_vendor}" == "redhat" %if "%{_vendor}" == "redhat"
BuildRequires: activemq-cpp-library-devel BuildRequires: activemq-cpp-library-devel
Requires: lhotse-varnish Requires: lhotse-varnish
#Requires: libactivemq-cpp6 Requires: libtrackrdr-activemq
%endif %endif
#Requires: logrotate #Requires: logrotate
#Requires(post): /sbin/chkconfig #Requires(post): /sbin/chkconfig
...@@ -29,6 +29,15 @@ intended for tracking from the Varnish shared memory log, collects all ...@@ -29,6 +29,15 @@ intended for tracking from the Varnish shared memory log, collects all
data for each XID, and sends each data record to an ActiveMQ message data for each XID, and sends each data record to an ActiveMQ message
broker. broker.
%package -n libtrackrdr-activemq
Summary: ActiveMQ implementation of the trackrdrd MQ interface
Group: System Environment/Libraries
Requires: libactivemq-cpp6
%description -n libtrackrdr-activemq
ActiveMQ implementation of the messaging interface for the Varnish log
tracking reader
%prep %prep
#Empty section. #Empty section.
...@@ -51,7 +60,18 @@ rm -rf %{_builddir}/* ...@@ -51,7 +60,18 @@ rm -rf %{_builddir}/*
%config(noreplace) %{_sysconfdir}/%{name}.conf %config(noreplace) %{_sysconfdir}/%{name}.conf
%config(noreplace) %{_sysconfdir}/init.d/%{name} %config(noreplace) %{_sysconfdir}/init.d/%{name}
%post -n libtrackrdr-activemq -p /sbin/ldconfig
%postun -n libtrackrdr-activemq -p /sbin/ldconfig
%files -n libtrackrdr-activemq
%defattr(-,root,root,-)
%{prefix}/lib/trackrdrd/*
%changelog %changelog
* Mon May 12 2014 Geoff Simmons <groff@uplex.de> 3.0
- Add package libtrackrdr-activemq, and adjust dependencies
* Mon Apr 29 2013 Geoff Simmons <geoff@uplex.de> 1.0 * Mon Apr 29 2013 Geoff Simmons <geoff@uplex.de> 1.0
- Fix dependencies for RedHat - Fix dependencies for RedHat
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment