|
|
|
|
@ -3,23 +3,15 @@
|
|
|
|
|
# Enable building and packing of the testsuite
|
|
|
|
|
%bcond_without testsuite
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Name: mariadb-connector-c
|
|
|
|
|
Version: 3.2.6
|
|
|
|
|
Version: 3.4.1
|
|
|
|
|
Release: 1%{?with_debug:.debug}%{?dist}
|
|
|
|
|
Summary: The MariaDB Native Client library (C driver)
|
|
|
|
|
License: LGPLv2+
|
|
|
|
|
Source: https://downloads.mariadb.org/interstitial/connector-c-%{version}/%{name}-%{version}-src.tar.gz
|
|
|
|
|
Source2: my.cnf
|
|
|
|
|
License: LGPL-2.1-or-later
|
|
|
|
|
Source: https://archive.mariadb.org/connector-c-%{version}/%{name}-%{version}-src.tar.gz
|
|
|
|
|
Source2: my.cnf.in
|
|
|
|
|
Source3: client.cnf
|
|
|
|
|
Url: http://mariadb.org/
|
|
|
|
|
# More information: https://mariadb.com/kb/en/mariadb/building-connectorc-from-source/
|
|
|
|
|
@ -28,8 +20,13 @@ Url: http://mariadb.org/
|
|
|
|
|
Patch1: testsuite.patch
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%if 0%{?flatpak}
|
|
|
|
|
Requires: %{name}-config = %{version}-%{release}
|
|
|
|
|
%else
|
|
|
|
|
Requires: %{_sysconfdir}/my.cnf
|
|
|
|
|
BuildRequires: gcc-c++ cmake openssl-devel zlib-devel
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
BuildRequires: gcc-c++ cmake openssl-devel zlib-devel libzstd-devel
|
|
|
|
|
# Remote-IO plugin
|
|
|
|
|
BuildRequires: libcurl-devel
|
|
|
|
|
# auth_gssapi_client plugin
|
|
|
|
|
@ -94,11 +91,11 @@ and require this package, so the /etc/my.cnf file is present.
|
|
|
|
|
%prep
|
|
|
|
|
%setup -q -n %{name}-%{version}-src
|
|
|
|
|
%if %{with testsuite}
|
|
|
|
|
%patch1 -p1
|
|
|
|
|
%patch -P1 -p1
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
# Remove unsused parts
|
|
|
|
|
rm -r win win-iconv zlib
|
|
|
|
|
rm -r win win-iconv external/zlib
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -115,6 +112,7 @@ rm -r win win-iconv zlib
|
|
|
|
|
%cmake . \
|
|
|
|
|
-DCMAKE_BUILD_TYPE="%{?with_debug:Debug}%{!?with_debug:RelWithDebInfo}" \
|
|
|
|
|
-DCMAKE_SYSTEM_PROCESSOR="%{_arch}" \
|
|
|
|
|
-DCMAKE_COMPILE_WARNING_AS_ERROR=0 \
|
|
|
|
|
\
|
|
|
|
|
-DMARIADB_UNIX_ADDR=%{_sharedstatedir}/mysql/mysql.sock \
|
|
|
|
|
-DMARIADB_PORT=3306 \
|
|
|
|
|
@ -147,6 +145,7 @@ cmake -B %__cmake_builddir -LAH
|
|
|
|
|
|
|
|
|
|
%cmake_build
|
|
|
|
|
|
|
|
|
|
sed -e 's|@SYSCONFDIR@|%{_sysconfdir}|' %{SOURCE2} > my.cnf
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
|
@ -162,7 +161,7 @@ ln -s mariadb_config %{buildroot}%{_bindir}/mysql_config
|
|
|
|
|
ln -s mariadb_version.h %{buildroot}%{_includedir}/mysql/mysql_version.h
|
|
|
|
|
|
|
|
|
|
# Install config files
|
|
|
|
|
install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/my.cnf
|
|
|
|
|
install -D -p -m 0644 my.cnf %{buildroot}%{_sysconfdir}/my.cnf
|
|
|
|
|
install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -176,9 +175,7 @@ install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
|
|
|
|
|
# - ignore the testsuite result for now. Enable tests now, fix them later.
|
|
|
|
|
# Note: there must be a database called 'test' created for the testcases to be run
|
|
|
|
|
%if %{with testsuite}
|
|
|
|
|
pushd unittest/libmariadb/
|
|
|
|
|
%ctest || :
|
|
|
|
|
popd
|
|
|
|
|
%ctest --test-dir %{__cmake_builddir}/unittest/libmariadb/ || :
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -196,7 +193,7 @@ popd
|
|
|
|
|
|
|
|
|
|
%files doc
|
|
|
|
|
# Library manual pages
|
|
|
|
|
%{_mandir}/man3/{mariadb,mysql}_*.3.*
|
|
|
|
|
%{_mandir}/man3/{mariadb,mysql}_*.3*
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -230,6 +227,7 @@ popd
|
|
|
|
|
%files test
|
|
|
|
|
%dir %{_datadir}/%{name}
|
|
|
|
|
%{_datadir}/%{name}/*
|
|
|
|
|
# Note: The following shared library should be moved from libdir to some sub-directory. e.g. libdir/mariadb/connector-c/tests
|
|
|
|
|
%{_libdir}/libcctap.so
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
@ -250,27 +248,58 @@ popd
|
|
|
|
|
# Need to ensure, that the testsuite will also run properly on 'fedpkg local' buid, not damaging the host machine
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Thu Aug 22 2024 Michal Schorm <mschorm@redhat.com> - 3.4.1-1
|
|
|
|
|
- Rebase to 3.4.1
|
|
|
|
|
|
|
|
|
|
* Wed Jul 31 2024 Michal Schorm <mschorm@redhat.com> - 3.3.10-1
|
|
|
|
|
- Rebase to 3.3.10
|
|
|
|
|
|
|
|
|
|
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.3.8-4
|
|
|
|
|
- Bump release for June 2024 mass rebuild
|
|
|
|
|
|
|
|
|
|
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.8-3
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.8-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Nov 28 2023 Michal Schorm <mschorm@redhat.com> - 3.3.8-1
|
|
|
|
|
- Rebase to 3.3.8
|
|
|
|
|
|
|
|
|
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue May 23 2023 Michal Schorm <mschorm@redhat.com> - 3.3.5-1
|
|
|
|
|
- Rebase to 3.3.5
|
|
|
|
|
|
|
|
|
|
* Tue Apr 18 2023 Michal Schorm <mschorm@redhat.com> - 3.3.4-1
|
|
|
|
|
- Rebase to 3.3.4
|
|
|
|
|
|
|
|
|
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7-3
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.7-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Sat Jun 11 2022 Michal Schorm <mschorm@redhat.com> - 3.2.7-1
|
|
|
|
|
- Rebase to 3.2.7
|
|
|
|
|
|
|
|
|
|
* Wed Feb 16 2022 Michal Schorm <mschorm@redhat.com> - 3.2.6-1
|
|
|
|
|
- Rebase to 3.2.6
|
|
|
|
|
- Introduction of a new '*-doc' subpackage
|
|
|
|
|
|
|
|
|
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.13-3
|
|
|
|
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
|
|
|
Related: rhbz#1991688
|
|
|
|
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.13-4
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 3.1.13-3
|
|
|
|
|
- Rebuilt with OpenSSL 3.0.0
|
|
|
|
|
|
|
|
|
|
* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.13-2
|
|
|
|
|
- Rebuilt for RHEL 9 BETA for openssl 3.0
|
|
|
|
|
Related: rhbz#1971065
|
|
|
|
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.13-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Fri May 14 2021 Michal Schorm <mschorm@redhat.com> - 3.1.13-1
|
|
|
|
|
- Rebase to 3.1.13
|
|
|
|
|
|
|
|
|
|
* Wed Apr 28 2021 Michal Schorm <mschorm@redhat.com> - 3.1.12-3
|
|
|
|
|
- Fix package conflicts
|
|
|
|
|
|
|
|
|
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.12-2
|
|
|
|
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
|
|
|
|
|
|
|
|
|
* Wed Feb 24 2021 Michal Schorm <mschorm@redhat.com> - 3.1.12-1
|
|
|
|
|
- Rebase to 3.1.12
|
|
|
|
|
|
|
|
|
|
|
