Merge branch 'rawhide' into epel8
This commit is contained in:
commit
dfd347e929
5 changed files with 82 additions and 207 deletions
10
.gitignore
vendored
10
.gitignore
vendored
|
|
@ -9,10 +9,6 @@ activemq-cpp-library-3.2.1-src.tar.gz
|
|||
/activemq-cpp-library-3.7.1-src.tar.gz
|
||||
/activemq-cpp-library-3.8.2-src.tar.gz
|
||||
/activemq-cpp-library-3.8.3-src.tar.gz
|
||||
/activemq-cpp-library-3.9.3-src.tar.bz2.asc
|
||||
/activemq-cpp-library-3.9.3-src.tar.gz
|
||||
/activemq-cpp-openssl1.patch
|
||||
/activemq-cpp-3.8.2-system-zlib.patch
|
||||
/activemq-cpp-gcc47.patch
|
||||
/activemq-cpp-local-texmf.patch
|
||||
/activemq-cpp.spec
|
||||
/activemq-cpp-library-3.8.4-src.tar.gz
|
||||
/activemq-cpp-library-3.9.4-src.tar.gz
|
||||
/activemq-cpp-library-3.9.5-src.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
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,24 +0,0 @@
|
|||
diff -uNr activemq-cpp-2.2.6.ORIG/texmf.cnf activemq-cpp-2.2.6/texmf.cnf
|
||||
--- activemq-cpp-2.2.6.ORIG/texmf.cnf 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ activemq-cpp-2.2.6/texmf.cnf 2009-11-07 20:47:00.466113909 +0100
|
||||
@@ -0,0 +1,2 @@
|
||||
+pool_size = 4000000
|
||||
+
|
||||
diff -uNr activemq-cpp-2.2.6.ORIG/doxygen-include.am activemq-cpp-2.2.6/doxygen-include.am
|
||||
--- activemq-cpp-2.2.6.ORIG/doxygen-include.am 2009-01-23 14:56:26.000000000 +0100
|
||||
+++ activemq-cpp-2.2.6/doxygen-include.am 2009-11-07 20:52:10.558509912 +0100
|
||||
@@ -153,12 +153,12 @@
|
||||
rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
|
||||
$(DX_PDFLATEX) refman.tex; \
|
||||
$(DX_MAKEINDEX) refman.idx; \
|
||||
- $(DX_PDFLATEX) refman.tex; \
|
||||
+ TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \
|
||||
countdown=5; \
|
||||
while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
|
||||
refman.log > /dev/null 2>&1 \
|
||||
&& test $$countdown -gt 0; do \
|
||||
- $(DX_PDFLATEX) refman.tex; \
|
||||
+ TEXMFCNF=.: $(DX_PDFLATEX) refman.tex; \
|
||||
countdown=`expr $$countdown - 1`; \
|
||||
done; \
|
||||
mv refman.pdf ../@PACKAGE@.pdf
|
||||
|
|
@ -1,206 +1,128 @@
|
|||
%global with_docs 0
|
||||
|
||||
%global globalversion 3.9.3
|
||||
%global globalrelease 3
|
||||
|
||||
Name: activemq-cpp
|
||||
Version: %{globalversion}
|
||||
Release: %{globalrelease}%{?dist}
|
||||
Version: 3.9.5
|
||||
Release: 1%{?dist}
|
||||
Summary: C++ implementation of JMS-like messaging client
|
||||
|
||||
Group: Development/Libraries
|
||||
License: ASL 2.0
|
||||
License: Apache-2.0
|
||||
URL: http://activemq.apache.org/cms/
|
||||
Source0: http://www.apache.org/dist/activemq/activemq-cpp/%{globalversion}/activemq-cpp-library-%{globalversion}-src.tar.gz
|
||||
Source1: http://www.apache.org/dist/activemq/activemq-cpp/3.8.3/activemq-cpp-library-3.8.3-src.tar.gz
|
||||
Patch0: activemq-cpp-3.8.2-system-zlib.patch
|
||||
# Some local texmf configuration to increase default pool_size.
|
||||
Patch1: activemq-cpp-local-texmf.patch
|
||||
Patch2: activemq-cpp-openssl1.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{globalversion}-%{globalrelease}-root-%(%{__id_u} -n)
|
||||
Source0: http://www.apache.org/dist/activemq/activemq-cpp/%{version}/activemq-cpp-library-%{version}-src.tar.gz
|
||||
Patch: activemq-cpp-3.8.2-system-zlib.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: zlib-devel
|
||||
%if %{?with_docs}0
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: graphviz
|
||||
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 6
|
||||
BuildRequires: tex(latex)
|
||||
%else
|
||||
BuildRequires: tetex-latex
|
||||
%endif
|
||||
%endif
|
||||
BuildRequires: apr-util-devel%{?_isa} >= 1.3
|
||||
BuildRequires: cppunit-devel%{?_isa} >= 1.10.2
|
||||
|
||||
%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
|
||||
BuildRequires: libuuid-devel%{?_isa}
|
||||
%else
|
||||
BuildRequires: e2fsprogs-devel%{?_isa}
|
||||
%endif
|
||||
BuildRequires: apr-util-devel >= 1.3
|
||||
BuildRequires: cppunit-devel >= 1.10.2
|
||||
BuildRequires: libuuid-devel
|
||||
|
||||
%description
|
||||
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.
|
||||
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.
|
||||
|
||||
%package devel
|
||||
Summary: C++ implementation header files for JMS-like messaging
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{globalversion}-%{globalrelease}%{?dist}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
%if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6
|
||||
Requires: libuuid-devel%{?_isa}
|
||||
%else
|
||||
Requires: e2fsprogs-devel%{?_isa}
|
||||
%endif
|
||||
Requires: libuuid-devel
|
||||
|
||||
%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
|
||||
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.
|
||||
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.
|
||||
|
||||
%{name}-devel contains development header files.
|
||||
|
||||
%if %{?with_docs}0
|
||||
%package doc
|
||||
Summary: C++ implementation header files for JMS-like messaging
|
||||
Group: Documentation
|
||||
%if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
|
||||
%description doc
|
||||
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.
|
||||
|
||||
%{name}-doc contains api documentation.
|
||||
%endif
|
||||
|
||||
%package -n activemq-cpp3.8
|
||||
Version: 3.8.3
|
||||
Release: %{globalrelease}%{?dist}
|
||||
Summary: C++ implementation of JMS-like messaging client
|
||||
|
||||
%description -n activemq-cpp3.8
|
||||
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.
|
||||
|
||||
%prep
|
||||
%setup -q -n activemq-cpp-library-3.9.3 -a 1
|
||||
pushd activemq-cpp-library-3.8.3
|
||||
%patch0 -p1
|
||||
%autosetup -n activemq-cpp-library-%{version} -p1
|
||||
rm -r src/main/decaf/internal/util/zip
|
||||
%if %{?with_docs}0
|
||||
%patch1 -p1
|
||||
%endif
|
||||
%patch2 -p1
|
||||
chmod 644 LICENSE.txt
|
||||
chmod 644 src/main/activemq/transport/mock/MockTransport.cpp
|
||||
popd
|
||||
|
||||
%patch0 -p1
|
||||
rm -r src/main/decaf/internal/util/zip
|
||||
%if %{?with_docs}0
|
||||
%patch1 -p1
|
||||
%endif
|
||||
chmod 644 LICENSE.txt
|
||||
chmod 644 src/main/activemq/transport/mock/MockTransport.cpp
|
||||
%configure --disable-static
|
||||
|
||||
|
||||
%build
|
||||
pushd activemq-cpp-library-3.8.3
|
||||
%configure --disable-static
|
||||
make %{?_smp_mflags}
|
||||
popd
|
||||
%make_build
|
||||
|
||||
# Build pdf(30MB) rather than default html(400MB).
|
||||
%if %{?with_docs}0
|
||||
%configure --disable-static --disable-doxygen-html --enable-doxygen-pdf
|
||||
%else
|
||||
%configure --disable-static
|
||||
%endif
|
||||
|
||||
make %{?_smp_mflags}
|
||||
%if %{?with_docs}0
|
||||
make %{?_smp_mflags} doxygen-run
|
||||
cp -p texmf.cnf doc/latex/texmf.cnf
|
||||
make %{?_smp_mflags} doxygen-pdf
|
||||
%endif
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
pushd activemq-cpp-library-3.8.3
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la
|
||||
rm $RPM_BUILD_ROOT/%{_bindir}/example
|
||||
# Remove devel from compat.
|
||||
rm $RPM_BUILD_ROOT/%{_bindir}/activemqcpp-config
|
||||
rm -rf $RPM_BUILD_ROOT/%{_includedir}/activemq-cpp-3.8.3
|
||||
rm $RPM_BUILD_ROOT/%{_libdir}/libactivemq-cpp.so
|
||||
rm $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/activemq-cpp.pc
|
||||
popd
|
||||
%make_install
|
||||
rm %{buildroot}%{_libdir}/lib%{name}.la
|
||||
rm %{buildroot}%{_bindir}/example
|
||||
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la
|
||||
rm $RPM_BUILD_ROOT/%{_bindir}/example
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%check
|
||||
make %{?_smp_mflags} check
|
||||
make check
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/lib%{name}.so.19*
|
||||
%doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt
|
||||
%{_libdir}/lib%{name}.so.*
|
||||
%license LICENSE.txt
|
||||
%doc NOTICE.txt README.txt RELEASE_NOTES.txt
|
||||
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/lib%{name}.so
|
||||
%{_includedir}/%{name}-%{globalversion}
|
||||
%{_includedir}/%{name}-%{version}
|
||||
%{_libdir}/pkgconfig/%{name}.pc
|
||||
%{_bindir}/activemqcpp-config
|
||||
|
||||
%if %{?with_docs}0
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%doc doc/%{name}.pdf
|
||||
%endif
|
||||
|
||||
%files -n activemq-cpp3.8
|
||||
%{_libdir}/lib%{name}.so.18*
|
||||
%doc LICENSE.txt
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Feb 17 2017 Steve Traylen <steve.traylen@cern.ch> - 3.9.3-3
|
||||
- Correct inter dependecy.
|
||||
* Wed Apr 03 2024 Jonathan Wright <jonathan@almalinux.org> - 3.9.5-1
|
||||
- Unorphan package
|
||||
- Update to 3.9.5
|
||||
- Overhaul spec file
|
||||
|
||||
* Wed Feb 15 2017 Steve Traylen <steve.traylen@cern.ch> - 3.9.3-3
|
||||
- Upstream to 3.9.3
|
||||
- Add activemqcpp-lib3.8 package to provide old version so.
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.4-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Wed Aug 27 2014 Steve Traylen <steve.traylen@cern.ch> - 3.8.4-1
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Apr 13 2018 Steve Traylen <steve.traylen@cern.ch> - 3.9.4-1
|
||||
- New from upstream
|
||||
- Add patch for openssl1
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.4-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.4-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.4-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.4-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.4-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.4-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.8.4-2
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Wed Mar 11 2015 Steve Traylen <steve.traylen@cern.ch> - 3.8.4-1
|
||||
- Upstream to 3.8.4
|
||||
|
||||
* Wed Aug 27 2014 Steve Traylen <steve.traylen@cern.ch> - 3.8.3-1
|
||||
- Upstream to 3.8.3
|
||||
|
||||
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.2-4
|
||||
|
|
@ -289,5 +211,3 @@ make %{?_smp_mflags} check
|
|||
|
||||
* Thu Feb 26 2009 Ricardo Rocha <ricardo.rocha@cern.ch> - 2.2.6-1
|
||||
- First version of the spec file
|
||||
|
||||
|
||||
|
|
|
|||
7
sources
7
sources
|
|
@ -1,6 +1 @@
|
|||
SHA512 (activemq-cpp-3.8.2-system-zlib.patch) = 178a92ac29492e39d44a1d98bac109bcffc5c16c4cd3b1e2725dc7f40c749d82ff76eee8ba99fbef5567cab3f696d1bdaec803f6d0aeeec3964eaac4c0ff78ec
|
||||
SHA512 (activemq-cpp-gcc47.patch) = afdf549f24250c655b0ec1aa5095a5d8b82d3ab7116d828fac3e2662dc8b229c7e40ed94d91e94d9c5bfdd0fea2a7b83b22868011a1992042b51a38a0afd507a
|
||||
SHA512 (activemq-cpp-library-3.8.3-src.tar.gz) = 204a4e484af5f7ec0615084c0d0ad272ebf89751d2bd4bcf8b56930c39cc7376534a3b284a7cfd6467bd8223a757961a696e2c92af2dc6cc08fe60144dfc250c
|
||||
SHA512 (activemq-cpp-library-3.9.3-src.tar.gz) = 56efa04abd4bfb9f5df592326f1cdd3d1adfe1ba6e5310d73c72d89e9c64b0d1ab9bcfab3bd91f9ebc6446774e6cb65c038efe36987ff41b2d9d6a0ff81eea20
|
||||
SHA512 (activemq-cpp-local-texmf.patch) = 53615f236e77ec160f17614ca4908fdcc0accef67d172ede051238dcbe7a2e85dbaf76386b4fcdbfcb067a072bb5de8a7300c5b302f1e04ad3d5998c190eb2a0
|
||||
SHA512 (activemq-cpp-openssl1.patch) = ec3dc225b1d72d157054ae79e94931051ae053845f7ba7712104973ca548a32b75616b64112ad5c5e49fccffcbc5f16e3173e02b7d44b62bb8a1efa9b6429ec4
|
||||
SHA512 (activemq-cpp-library-3.9.5-src.tar.gz) = 6481974f079b63f78fa9988726a544e86206c535066621068dae4e0856316219f92f4ead032431fa3d11a90e496e6d23b7f0f0183e44b4f51d47a98c82dc9078
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue