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:
parent
d3e3b83558
commit
22ac6c095b
12
galera.spec
12
galera.spec
@ -1,6 +1,6 @@
|
|||||||
Name: galera
|
Name: galera
|
||||||
Version: 25.3.23
|
Version: 25.3.23
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: Synchronous multi-master wsrep provider (replication engine)
|
Summary: Synchronous multi-master wsrep provider (replication engine)
|
||||||
|
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
@ -17,12 +17,7 @@ Source2: garbd-wrapper
|
|||||||
|
|
||||||
Patch0: galera-python3.patch
|
Patch0: galera-python3.patch
|
||||||
|
|
||||||
BuildRequires: boost-devel check-devel openssl-devel python3-scons systemd gcc-c++
|
BuildRequires: boost-devel check-devel openssl-devel python3-scons systemd gcc-c++ asio-devel
|
||||||
%if 0%{?rhel}
|
|
||||||
Provides: bundled(asio)
|
|
||||||
%else
|
|
||||||
BuildRequires: asio-devel
|
|
||||||
%endif
|
|
||||||
Requires: nmap-ncat
|
Requires: nmap-ncat
|
||||||
|
|
||||||
|
|
||||||
@ -93,6 +88,9 @@ install -D -m 644 scripts/packages/README-MySQL %{buildroot}%{_docdir}/galera/RE
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* Fri Jul 13 2018 Honza Horak <hhorak@redhat.com> - 25.3.23-4
|
||||||
- Add explicit gcc-c++ BR
|
- Add explicit gcc-c++ BR
|
||||||
- Use python3-scons
|
- Use python3-scons
|
||||||
|
Loading…
Reference in New Issue
Block a user