Revert "Do not require asio on rhel"

This reverts commit d617063906.

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.
This commit is contained in:
Honza Horak 2018-07-16 17:03:20 +02:00
parent d3e3b83558
commit 22ac6c095b

View File

@ -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 <hhorak@redhat.com> - 25.3.23-5
- Require asio also on rhel
* Fri Jul 13 2018 Honza Horak <hhorak@redhat.com> - 25.3.23-4
- Add explicit gcc-c++ BR
- Use python3-scons