Merge branch 'master' into el6

Conflicts:
	.gitignore
	activemq-cpp.spec
	sources
This commit is contained in:
Steve Traylen 2010-11-10 23:16:25 +01:00
commit 4f5293bde1
3 changed files with 6 additions and 2 deletions

1
.gitignore vendored
View file

@ -1 +1,2 @@
activemq-cpp-library-3.2.1-src.tar.gz
/activemq-cpp-library-3.2.3-src.tar.gz

View file

@ -1,5 +1,5 @@
Name: activemq-cpp
Version: 3.2.1
Version: 3.2.3
Release: 1%{?dist}
Summary: C++ implementation of JMS-like messaging client
@ -131,6 +131,9 @@ make %{?_smp_mflags} check
%doc doc/%{name}.pdf
%changelog
* Wed Nov 10 2010 Steve Traylen <steve.traylen@cern.ch> - 3.2.3-1
- Upstream to 3.2.3
* Thu Jul 22 2010 Steve Traylen <steve.traylen@cern.ch> - 3.2.1-1
- Upstream to 3.2.1
- Add BR of openssl-devel since library now supports ssl

View file

@ -1 +1 @@
877d0e4bdedfdaaad37e18c80d85493d activemq-cpp-library-3.2.1-src.tar.gz
f4a3db74eeb874aee925714bcb3c2c84 activemq-cpp-library-3.2.3-src.tar.gz