Merge remote-tracking branch 'origin/release/8.0.26' into ninja-build

Author: rsomla1

packaging/mysql-connector-c++.spec.in

@@ -55,7 +55,7 @@ License:        %{license_type}
 URL:            https://dev.mysql.com/doc/connector-cpp/en/
 Source0:        https://dev.mysql.com/get/Downloads/Connector-C++/mysql-connector-c++%{?product_suffix}-%{version}-src.tar.gz
 #BuildRequires:  boost-devel
-%if 0%{?rhel}
+%if 0%{?rhel} < 8
 BuildRequires:  cmake3
 %else
 BuildRequires:  cmake
@@ -126,7 +126,7 @@ test suite for MySQL Connector/C++
 %endif
 %global __cmake_explicit_opts -DCMAKE_INSTALL_PREFIX="%_prefix" -DCMAKE_C_FLAGS:STRING="%optflags" -DCMAKE_CXX_FLAGS:STRING="%optflags"
 %global __cmake_common_opts -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/mysql-cppconn-8 -DWITH_JDBC=ON -DWITH_SSL=system %{__cmake_test_opts} %{?mysql_opt} -DDEBUG_PREFIX_MAP=OFF
-%if 0%{?rhel}
+%if 0%{?rhel} < 8
 %global __cmake_cmd cmake3 %{__cmake_common_opts} %{__cmake_explicit_opts} ..
 %else
 %global __cmake_cmd cmake %{__cmake_common_opts} %{__cmake_explicit_opts} ..
@@ -215,6 +215,9 @@ rm %{buildroot}/usr/{INFO_SRC,INFO_BIN}
 %endif
 
 %changelog
+* Wed Jun 09 2021 Gipson Pulla <[email protected]> - 8.0.26-1
+- The cmake3 binary isn't required for el8 platforms
+
 * Fri Feb 05 2021 Kent Boortz <[email protected]> - 8.0.24-1
 - Aligned compiler settings with server