.gitignore

@@ -1 +1 @@
-SOURCES/mariadb-connector-c-3.4.1-src.tar.gz
+SOURCES/mariadb-connector-c-3.2.6-src.tar.gz

.mariadb-connector-c.metadata

@@ -1 +1 @@
-685fc6622bd2797eb2a1ddbdbe09fd1150bb0952 SOURCES/mariadb-connector-c-3.4.1-src.tar.gz
+5cdba92ad2eb72a81a0ec33003b8f591910d2eb2 SOURCES/mariadb-connector-c-3.2.6-src.tar.gz

SOURCES/my.cnf

@@ -7,5 +7,5 @@
 #
 # include all files from the config directory
 #
-!includedir @SYSCONFDIR@/my.cnf.d
+!includedir /etc/my.cnf.d
 

SOURCES/testsuite.patch

@@ -1,9 +1,10 @@
---- mariadb-connector-c-3.4.1-src/unittest/libmariadb/CMakeLists.txt	2024-08-03 16:38:02.000000000 +0200
+--- mariadb-connector-c-3.1.3-src/unittest/libmariadb/CMakeLists.txt	2019-07-25 10:03:48.000000000 -0400
-+++ mariadb-connector-c-3.4.1-src/unittest/libmariadb/CMakeLists.txt_patched	2024-08-22 23:52:11.773978003 +0200
++++ mariadb-connector-c-3.1.3-src/unittest/libmariadb/CMakeLists.txt_patched	2019-08-19 17:02:26.317247605 -0400
-@@ -95,3 +95,6 @@ FOREACH(FILE ${ADDITIONAL_FILES})
+@@ -71,3 +71,7 @@ FOREACH(API_TEST ${MANUAL_TESTS})
-                  COPYONLY)
+   ADD_EXECUTABLE(${API_TEST} ${API_TEST}.c)
+   TARGET_LINK_LIBRARIES(${API_TEST} cctap ma_getopt mariadbclient)
  ENDFOREACH()
- 
++
 +INSTALL(TARGETS ${API_TESTS} DESTINATION ${SHAREDIR}/mariadb-connector-c/tests COMPONENT Tests)
-+INSTALL(FILES ${CC_BINARY_DIR}/unittest/mytap/libcctap.so PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${INSTALL_LIBDIR} COMPONENT Tests)
++INSTALL(FILES ${CC_SOURCE_DIR}/unittest/mytap/libcctap.so PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${INSTALL_LIBDIR} COMPONENT Tests)
-+INSTALL(FILES ${CC_BINARY_DIR}/unittest/libmariadb/CTestTestfile.cmake DESTINATION ${SHAREDIR}/mariadb-connector-c/tests COMPONENT Tests)
++INSTALL(FILES ${CC_SOURCE_DIR}/unittest/libmariadb/CTestTestfile.cmake DESTINATION ${SHAREDIR}/mariadb-connector-c/tests COMPONENT Tests)

SPECS/mariadb-connector-c.spec

@@ -3,15 +3,23 @@
 # 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.4.1
+Version:        3.2.6
-Release:        2%{?with_debug:.debug}%{?dist}
+Release:        1%{?with_debug:.debug}%{?dist}
 Summary:        The MariaDB Native Client library (C driver)
-License:        LGPL-2.1-or-later
+License:        LGPLv2+
-Source:         https://archive.mariadb.org/connector-c-%{version}/%{name}-%{version}-src.tar.gz
+Source:         https://downloads.mariadb.org/interstitial/connector-c-%{version}/%{name}-%{version}-src.tar.gz
-Source2:        my.cnf.in
+Source2:        my.cnf
 Source3:        client.cnf
 Url:            http://mariadb.org/
 # More information: https://mariadb.com/kb/en/mariadb/building-connectorc-from-source/
@@ -20,13 +28,8 @@ Url:            http://mariadb.org/
 Patch1:         testsuite.patch
 %endif
 
-%if 0%{?flatpak}
-Requires:       %{name}-config = %{version}-%{release}
-%else
 Requires:       %{_sysconfdir}/my.cnf
-%endif
+BuildRequires:  gcc-c++ cmake openssl-devel zlib-devel
-
-BuildRequires:  gcc-c++ cmake openssl-devel zlib-devel libzstd-devel
 # Remote-IO plugin
 BuildRequires:  libcurl-devel
 # auth_gssapi_client plugin
@@ -91,11 +94,11 @@ and require this package, so the /etc/my.cnf file is present.
 %prep
 %setup -q -n %{name}-%{version}-src
 %if %{with testsuite}
-%patch -P1 -p1
+%patch1 -p1
 %endif
 
 # Remove unsused parts
-rm -r win win-iconv external/zlib
+rm -r win win-iconv zlib
 
 
 
@@ -112,7 +115,6 @@ rm -r win win-iconv external/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 \
@@ -145,7 +147,6 @@ cmake -B %__cmake_builddir -LAH
 
 %cmake_build
 
-sed -e 's|@SYSCONFDIR@|%{_sysconfdir}|' %{SOURCE2} > my.cnf
 
 
 %install
@@ -161,7 +162,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 my.cnf %{buildroot}%{_sysconfdir}/my.cnf
+install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/my.cnf
 install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
 
 
@@ -175,7 +176,9 @@ 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}
-%ctest --test-dir %{__cmake_builddir}/unittest/libmariadb/ || :
+pushd unittest/libmariadb/
+%ctest || :
+popd
 %endif
 
 
@@ -193,7 +196,7 @@ install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
 
 %files doc
 # Library manual pages
-%{_mandir}/man3/{mariadb,mysql}_*.3*
+%{_mandir}/man3/{mariadb,mysql}_*.3.*
 
 
 
@@ -227,7 +230,6 @@ install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
 %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
 
@@ -248,62 +250,27 @@ install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
 #      Need to ensure, that the testsuite will also run properly on 'fedpkg local' buid, not damaging the host machine
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.4.1-2
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* 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
 
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.13-4
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.13-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-
+  Related: rhbz#1991688
-* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 3.1.13-3
-- Rebuilt with OpenSSL 3.0.0
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.13-2
+* Wed Jun 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.1.13-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
 
 * 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