Upstream to 3.4.1
Add patch for gcc47, AMQCPP-389
This commit is contained in:
parent
05f8229904
commit
169a338d28
4 changed files with 24 additions and 4 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -4,3 +4,4 @@ activemq-cpp-library-3.2.1-src.tar.gz
|
|||
/activemq-cpp-library-3.2.5-src.tar.gz
|
||||
/activemq-cpp-library-3.3.0-src.tar.gz
|
||||
/activemq-cpp-library-3.4.0-src.tar.gz
|
||||
/activemq-cpp-library-3.4.1-src.tar.gz
|
||||
|
|
|
|||
12
activemq-cpp-gcc47.patch
Normal file
12
activemq-cpp-gcc47.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -uNr activemq-cpp-library-3.4.1.ORIG/src/main/decaf/util/AbstractQueue.h activemq-cpp-library-3.4.1/src/main/decaf/util/AbstractQueue.h
|
||||
--- activemq-cpp-library-3.4.1.ORIG/src/main/decaf/util/AbstractQueue.h 2012-02-19 21:37:49.536000023 +0100
|
||||
+++ activemq-cpp-library-3.4.1/src/main/decaf/util/AbstractQueue.h 2012-02-19 21:38:56.722000023 +0100
|
||||
@@ -60,7 +60,7 @@
|
||||
*/
|
||||
virtual bool add( const E& value ) {
|
||||
|
||||
- if( offer( value ) ) {
|
||||
+ if( this->offer( value ) ) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
Name: activemq-cpp
|
||||
Version: 3.4.0
|
||||
Release: 2%{?dist}
|
||||
Version: 3.4.1
|
||||
Release: 1%{?dist}
|
||||
Summary: C++ implementation of JMS-like messaging client
|
||||
|
||||
Group: Development/Libraries
|
||||
|
|
@ -8,7 +8,9 @@ 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
|
||||
# Some local texmf configuration to increase default pool_size.
|
||||
Patch1: %{name}-local-texmf.patch
|
||||
Patch1: activemq-cpp-local-texmf.patch
|
||||
# https://issues.apache.org/jira/browse/AMQCPP-389
|
||||
Patch2: activemq-cpp-gcc47.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: doxygen
|
||||
|
|
@ -82,6 +84,7 @@ for your clients to communicate.
|
|||
%prep
|
||||
%setup -q -n activemq-cpp-library-%{version}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
chmod 644 LICENSE.txt
|
||||
chmod 644 src/main/activemq/transport/mock/MockTransport.cpp
|
||||
|
||||
|
|
@ -127,6 +130,10 @@ make %{?_smp_mflags} check
|
|||
%doc doc/%{name}.pdf
|
||||
|
||||
%changelog
|
||||
* Tue Feb 12 2012 Steve Traylen <steve.traylen@cern.ch> - 3.4.1-1
|
||||
- Upstream to 3.4.1
|
||||
- Add patch for gcc47, AMQCPP-389
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.4.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
1e476bb5e8b98d095c0ac917ebd31026 activemq-cpp-library-3.4.0-src.tar.gz
|
||||
04bf86d82dbace2e6b256315427358a6 activemq-cpp-library-3.4.1-src.tar.gz
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue