From 5a4b6e2afe51c6afc949c6b4b7ed30e823c23388 Mon Sep 17 00:00:00 2001 From: bzhaoop Date: Wed, 23 Mar 2022 03:42:12 +0000 Subject: [PATCH] Correct the SPEC for matching the latest CMAKE dependency. Due to the latest version of CMAKE CLI behavior had changed, so we need to refactor our spec accordlly. (cherry picked from commit 1afe08ed62f672fea75b0319a11e9b10a60867d8) --- mariadb-connector-odbc.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mariadb-connector-odbc.spec b/mariadb-connector-odbc.spec index 71a824e..d4a5956 100644 --- a/mariadb-connector-odbc.spec +++ b/mariadb-connector-odbc.spec @@ -1,13 +1,13 @@ Name: mariadb-connector-odbc Version: 3.1.11 -Release: 1 +Release: 2 Summary: The MariaDB Native Client library (ODBC driver) License: LGPLv2+ Source0: mariadb-connector-odbc-%{version}/%{name}-%{version}-ga-src.tar.gz Url: https://mariadb.org/en/ # Online documentation can be found at: https://mariadb.com/kb/en/library/mariadb-connector-odbc/ -BuildRequires: cmake unixODBC-devel gcc-c++ +BuildRequires: cmake make unixODBC-devel gcc-c++ BuildRequires: mariadb-connector-c-devel >= 3.0.6 Patch1: libraries_include_path.patch @@ -26,14 +26,13 @@ and it supports both Unicode and ANSI modes. %cmake . \ -DCMAKE_BUILD_TYPE="%{?with_debug:Debug}%{!?with_debug:RelWithDebInfo}" \ -DMARIADB_LINK_DYNAMIC="%{_libdir}/libmariadb.so" \ -\ -DINSTALL_LAYOUT=RPM \ -DINSTALL_LIBDIR="%{_lib}" \ -DINSTALL_LIB_SUFFIX="%{_lib}" \ -DINSTALL_DOCDIR="%{_defaultdocdir}/%{name}" \ - -DINSTALL_LICENSEDIR="%{_defaultlicensedir}/%{name}" \ + -DINSTALL_LICENSEDIR="%{_defaultlicensedir}/%{name}" -%cmake --build . +cmake --build . %install %make_install @@ -46,5 +45,8 @@ and it supports both Unicode and ANSI modes. %{_libdir}/libmaodbc.so %changelog +* Wed Mar 23 2022 bzhaoop - 3.1.11-2 +- Fix for fitting the new version Cmake. + * Wed Mar 3 2021 Zheng Zhenyu - 3.1.11-1 - Initial Commit -- Gitee