From 22ac6c095b700b85e236e5a15f7089793f72a3e4 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Mon, 16 Jul 2018 17:03:20 +0200 Subject: [PATCH] Revert "Do not require asio on rhel" This reverts commit d617063906baf320c3fff51bf9a991a132d1de8b. The reason is that asio is just a build-time dependency, so it is usually not necessary to bundle it, and on newer rhels the bundled asio will not be compatible with the openssl available in the base system. --- galera.spec | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/galera.spec b/galera.spec index df8384c..efb5e6d 100644 --- a/galera.spec +++ b/galera.spec @@ -1,6 +1,6 @@ Name: galera Version: 25.3.23 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Synchronous multi-master wsrep provider (replication engine) License: GPLv2 @@ -17,12 +17,7 @@ Source2: garbd-wrapper Patch0: galera-python3.patch -BuildRequires: boost-devel check-devel openssl-devel python3-scons systemd gcc-c++ -%if 0%{?rhel} -Provides: bundled(asio) -%else -BuildRequires: asio-devel -%endif +BuildRequires: boost-devel check-devel openssl-devel python3-scons systemd gcc-c++ asio-devel Requires: nmap-ncat @@ -93,6 +88,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE %changelog +* Mon Jul 16 2018 Honza Horak - 25.3.23-5 +- Require asio also on rhel + * Fri Jul 13 2018 Honza Horak - 25.3.23-4 - Add explicit gcc-c++ BR - Use python3-scons