From 9ca450d322809f9468f05cf32277eee5d83eb21e Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 16 Feb 2017 10:30:47 +0100 Subject: [PATCH 01/10] Upstream to 3.9.3 Add activemqcpp-lib3.8 package to provide old version so. --- .gitignore | 2 ++ activemq-cpp.spec | 65 +++++++++++++++++++++++++++++++++++++++++------ sources | 1 + 3 files changed, 60 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index e48eb12..c303216 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ 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 diff --git a/activemq-cpp.spec b/activemq-cpp.spec index fe241a8..7a5c9c5 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,18 +1,22 @@ %global with_docs 0 +%global globalversion 3.9.3 +%global globalrelease 2 + Name: activemq-cpp -Version: 3.8.3 -Release: 1%{?dist} +Version: %{globalversion} +Release: %{globalrelease}%{?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/%{version}/activemq-cpp-library-%{version}-src.tar.gz +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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{globalversion}-%{globalrelease}-root-%(%{__id_u} -n) BuildRequires: openssl-devel BuildRequires: zlib-devel @@ -45,7 +49,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} = %{globalversion}-%{globalrelease} Requires: pkgconfig %if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 Requires: libuuid-devel%{?_isa} @@ -82,8 +86,28 @@ 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-%{version} +%setup -q -n activemq-cpp-library-3.9.3 -a 1 +pushd activemq-cpp-library-3.8.3 +%patch0 -p1 +rm -r src/main/decaf/internal/util/zip +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 @@ -94,6 +118,11 @@ chmod 644 src/main/activemq/transport/mock/MockTransport.cpp %build +pushd activemq-cpp-library-3.8.3 +%configure --disable-static +make %{?_smp_mflags} +popd + # Build pdf(30MB) rather than default html(400MB). %if %{?with_docs}0 %configure --disable-static --disable-doxygen-html --enable-doxygen-pdf @@ -110,6 +139,17 @@ make %{?_smp_mflags} doxygen-pdf %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 DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{_libdir}/lib%{name}.la rm $RPM_BUILD_ROOT/%{_bindir}/example @@ -125,13 +165,13 @@ make %{?_smp_mflags} check %files %defattr(-,root,root,-) -%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}.so.19* %doc LICENSE.txt NOTICE.txt README.txt RELEASE_NOTES.txt %files devel %defattr(-,root,root,-) %{_libdir}/lib%{name}.so -%{_includedir}/%{name}-%{version} +%{_includedir}/%{name}-%{globalversion} %{_libdir}/pkgconfig/%{name}.pc %{_bindir}/activemqcpp-config @@ -141,7 +181,16 @@ make %{?_smp_mflags} check %doc doc/%{name}.pdf %endif +%files -n activemq-cpp3.8 +%{_libdir}/lib%{name}.so.18* +%doc LICENSE.txt + + %changelog +* Tue Feb 15 2017 Steve Traylen - 3.9.3-1 +- Upstream to 3.9.3 +- Add activemqcpp-lib3.8 package to provide old version so. + * Wed Aug 27 2014 Steve Traylen - 3.8.4-1 - Upstream to 3.8.3 diff --git a/sources b/sources index c2c7455..2b1bd76 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 065a9ea9b279e512cd96a985869bd697 activemq-cpp-library-3.8.3-src.tar.gz +SHA512 (activemq-cpp-library-3.9.3-src.tar.gz) = 56efa04abd4bfb9f5df592326f1cdd3d1adfe1ba6e5310d73c72d89e9c64b0d1ab9bcfab3bd91f9ebc6446774e6cb65c038efe36987ff41b2d9d6a0ff81eea20 From 2c802ad4e7cc70c5cd55f11a03f7c01ef333d5e1 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 16 Feb 2017 10:33:35 +0100 Subject: [PATCH 02/10] Correct day of week --- activemq-cpp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 7a5c9c5..bd50052 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -187,7 +187,7 @@ make %{?_smp_mflags} check %changelog -* Tue Feb 15 2017 Steve Traylen - 3.9.3-1 +* Wed Feb 15 2017 Steve Traylen - 3.9.3-1 - Upstream to 3.9.3 - Add activemqcpp-lib3.8 package to provide old version so. From d42508d00386abeaf6e2f91b7946d324d402db70 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 16 Feb 2017 10:41:35 +0100 Subject: [PATCH 03/10] Use SHA2 of sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 2b1bd76..90f82de 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -065a9ea9b279e512cd96a985869bd697 activemq-cpp-library-3.8.3-src.tar.gz +SHA512 (activemq-cpp-library-3.8.3-src.tar.gz) = 204a4e484af5f7ec0615084c0d0ad272ebf89751d2bd4bcf8b56930c39cc7376534a3b284a7cfd6467bd8223a757961a696e2c92af2dc6cc08fe60144dfc250c SHA512 (activemq-cpp-library-3.9.3-src.tar.gz) = 56efa04abd4bfb9f5df592326f1cdd3d1adfe1ba6e5310d73c72d89e9c64b0d1ab9bcfab3bd91f9ebc6446774e6cb65c038efe36987ff41b2d9d6a0ff81eea20 From d38ec44d5c95b0a8c2d01ccd1d76ef68692e2646 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Fri, 17 Feb 2017 16:50:53 +0100 Subject: [PATCH 04/10] Correct inter dependency. --- activemq-cpp.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index bd50052..0b96282 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -1,7 +1,7 @@ %global with_docs 0 %global globalversion 3.9.3 -%global globalrelease 2 +%global globalrelease 3 Name: activemq-cpp Version: %{globalversion} @@ -49,7 +49,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} = %{globalversion}-%{globalrelease} +Requires: %{name} = %{globalversion}-%{globalrelease}%{?dist} Requires: pkgconfig %if %{?fedora}%{!?fedora:0} >= 12 || %{?rhel}%{!?rhel:0} >= 6 Requires: libuuid-devel%{?_isa} @@ -187,7 +187,10 @@ make %{?_smp_mflags} check %changelog -* Wed Feb 15 2017 Steve Traylen - 3.9.3-1 +* Fri Feb 17 2017 Steve Traylen - 3.9.3-3 +- Correct inter dependecy. + +* Wed Feb 15 2017 Steve Traylen - 3.9.3-3 - Upstream to 3.9.3 - Add activemqcpp-lib3.8 package to provide old version so. From 650418bfa758a6dcc1f021bda9b310357ea6b7b8 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 12 Nov 2019 08:32:27 -0600 Subject: [PATCH 05/10] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 17604ba21709909ca80a7fa912e91581dbc420d7 Mon Sep 17 00:00:00 2001 From: andreamanzi Date: Mon, 18 Nov 2019 21:23:31 +0100 Subject: [PATCH 06/10] add patch for openss1.1.1 --- .gitignore | 1 + activemq-cpp.spec | 2 ++ sources | 3 +-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c303216..4440907 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ activemq-cpp-library-3.2.1-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 diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 0b96282..6bc6b19 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -16,6 +16,8 @@ Source1: http://www.apache.org/dist/activemq/activemq-cpp/3.8.3/activemq- 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) BuildRequires: openssl-devel diff --git a/sources b/sources index 90f82de..b10219c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -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-openssl1.patch) = ec3dc225b1d72d157054ae79e94931051ae053845f7ba7712104973ca548a32b75616b64112ad5c5e49fccffcbc5f16e3173e02b7d44b62bb8a1efa9b6429ec4 From 1aee93963d0afc1a4b6bed3b164e015e65487a79 Mon Sep 17 00:00:00 2001 From: andreamanzi Date: Mon, 18 Nov 2019 21:27:21 +0100 Subject: [PATCH 07/10] new sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4440907..7248024 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ activemq-cpp-library-3.2.1-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 diff --git a/sources b/sources index b10219c..6d7e0d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (activemq-cpp-openssl1.patch) = ec3dc225b1d72d157054ae79e94931051ae053845f7ba7712104973ca548a32b75616b64112ad5c5e49fccffcbc5f16e3173e02b7d44b62bb8a1efa9b6429ec4 +SHA512 (activemq-cpp-3.8.2-system-zlib.patch) = 178a92ac29492e39d44a1d98bac109bcffc5c16c4cd3b1e2725dc7f40c749d82ff76eee8ba99fbef5567cab3f696d1bdaec803f6d0aeeec3964eaac4c0ff78ec From 6fc978099e28fe3a5cf138269950ba58897720b9 Mon Sep 17 00:00:00 2001 From: andreamanzi Date: Mon, 18 Nov 2019 21:29:44 +0100 Subject: [PATCH 08/10] upload all sources --- .gitignore | 3 +++ sources | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 7248024..5c2030e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ activemq-cpp-library-3.2.1-src.tar.gz /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 diff --git a/sources b/sources index 6d7e0d2..46f4d11 100644 --- a/sources +++ b/sources @@ -1 +1,6 @@ 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.spec) = f04da9421607dacf0e2a574fb544d7c7eac95129cf824d561d3eebb1e5b400c28abd128c231acd8e531b571b8763c0bfe76afd57db3e94ed24936291812d32c2 From feb26e35f3f8bc0da46e6a4d5891d819cdd29633 Mon Sep 17 00:00:00 2001 From: andreamanzi Date: Mon, 18 Nov 2019 21:30:30 +0100 Subject: [PATCH 09/10] upload all sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 46f4d11..af7a9ab 100644 --- a/sources +++ b/sources @@ -3,4 +3,4 @@ SHA512 (activemq-cpp-gcc47.patch) = afdf549f24250c655b0ec1aa5095a5d8b82d3ab7116d 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.spec) = f04da9421607dacf0e2a574fb544d7c7eac95129cf824d561d3eebb1e5b400c28abd128c231acd8e531b571b8763c0bfe76afd57db3e94ed24936291812d32c2 +SHA512 (activemq-cpp-openssl1.patch) = ec3dc225b1d72d157054ae79e94931051ae053845f7ba7712104973ca548a32b75616b64112ad5c5e49fccffcbc5f16e3173e02b7d44b62bb8a1efa9b6429ec4 From 69ff2dce1f94954f1e840da5eb40effd38df9a16 Mon Sep 17 00:00:00 2001 From: andreamanzi Date: Mon, 18 Nov 2019 21:39:18 +0100 Subject: [PATCH 10/10] actually apply the patches --- activemq-cpp.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/activemq-cpp.spec b/activemq-cpp.spec index 6bc6b19..753bb4e 100644 --- a/activemq-cpp.spec +++ b/activemq-cpp.spec @@ -106,6 +106,10 @@ ActiveMQ is still needed for your clients to communicate. pushd activemq-cpp-library-3.8.3 %patch0 -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