libmariadb-3.1.12-1

lib/libm/libmariadb/libmariadb-vl.spec

@@ -1,7 +1,7 @@
 Name:           libmariadb
 Summary:        The MariaDB Native Client library (C driver)
 Epoch:          1
-Version:        3.1.11
+Version:        3.1.12
 Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
@@ -14,12 +14,22 @@ Source:         https://downloads.mariadb.com/Connectors/c/connector-c-%{version
 Source2:        my.cnf
 Source3:        client.cnf
 # More information: https://mariadb.com/kb/en/mariadb/building-connectorc-from-source/
+# https://github.com/mariadb-corporation/mariadb-connector-c/commit/242cab8cbcd91af882233730a83627d3b12ced83
+Patch0: libmariadb-cmake3.20.patch
 
 Requires:       mariadb-common
 BuildRequires:  zlib-devel cmake openssl-devel gcc-c++
 # Remote-IO plugin
 BuildRequires:  curl-devel
 
+# Enable CMake in-source builds
+#   This is is a workaround for the https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
+#   which reverts the CMake behaviour to before F33
+#   The Change owners offered themselves to help fix the affected packages via ProvenPackager rights.
+#   I'm generally in favor of this change, however when I tried to adapt it, I encountered a number of issues.
+#   That's why I disabled it for now.
+%global __cmake_in_source_build 1
+
 %description
 The MariaDB Native Client library (C driver) is used to connect applications
 developed in C/C++ to MariaDB and MySQL databases.
@@ -29,7 +39,7 @@ developed in C/C++ to MariaDB and MySQL databases.
 Summary:        Development files for mariadb-connector-c
 Group:          programming
 Provides:       libmysqlclient-devel = %{epoch}:%{version}-%{release}
-Obsoletes:      libmysqlclient-devel
+Obsoletes:      libmysqlclient-devel < 5.6.0
 Requires:       %{name} = %{epoch}:%{version}-%{release}
 Requires:       openssl-devel
 
@@ -38,7 +48,6 @@ Development files for mariadb-connector-c.
 Contains everything needed to build against libmariadb.so >=3 client library.
 
 
-
 %package -n mariadb-common
 Summary:        Configuration files for packages that use /etc/my.cnf as a configuration file
 Group:          system
@@ -56,12 +65,12 @@ and require this package, so the /etc/my.cnf file is present.
 
 %prep
 %setup -q -n mariadb-connector-c-%{version}-src
+%autopatch -p1
 
 # Remove unsused parts
 rm -r win zlib win-iconv
 
 
-
 %build
 
 # https://jira.mariadb.org/browse/MDEV-13836:
@@ -73,7 +82,7 @@ rm -r win zlib win-iconv
 # The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX
 # so we can't use %%{_datadir} and so forth here.
 
-%cmake . \
+%cmake \
        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DCMAKE_SYSTEM_PROCESSOR="%{_arch}" \
 \
@@ -83,6 +92,7 @@ rm -r win zlib win-iconv
        -DWITH_EXTERNAL_ZLIB=YES \
        -DWITH_SSL=OPENSSL \
        -DWITH_MYSQLCOMPAT=ON \
+       -DPLUGIN_CLIENT_ED25519=DYNAMIC \
 \
        -DINSTALL_LAYOUT=RPM \
        -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
@@ -90,21 +100,18 @@ rm -r win zlib win-iconv
        -DINSTALL_LIBDIR="%{_lib}" \
        -DINSTALL_INCLUDEDIR="include/mysql" \
        -DINSTALL_PLUGINDIR="%{_lib}/mariadb/plugin" \
+       -DINSTALL_PCDIR="%{_lib}/pkgconfig" \
 \
        -DWITH_UNITTEST=ON
 
-
-
-#cmake -LAH
-
-make %{?_smp_mflags}
+%cmake_build
 
 
 
 %install
 rm -rf %{buildroot}
 
-make install DESTDIR=%{buildroot}
+%cmake_install
 
 #multilib_fix_c_header --file %{_includedir}/mysql/mariadb_version.h
 
@@ -130,7 +137,7 @@ install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
 # - don't run mytap tests
 # - ignore the testsuite result for now. Enable tests now, fix them later.
 pushd unittest/libmariadb/
-ctest || :
+%ctest || :
 popd
 
 
@@ -188,6 +195,10 @@ end
 
 
 %changelog
+* Sun May 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.1.12-1
+- new upstream release.
+- imported Patch0 from upstream to build with cmake-3.20.
+
 * Sat Feb 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.1.11-1
 - new upstream release.