Compare commits

..

No commits in common. "0169c2a1e9f52bc105a33ecdf67e6d5d0ce33a34" and "f811b1fa4a6eb7eb11de4eecc115b1548003b800" have entirely different histories.

5 changed files with 3 additions and 71 deletions

View File

@ -1,25 +0,0 @@
From d2a3bc9049f364b10f9f586c993e0eac60eee254 Mon Sep 17 00:00:00 2001
From: laokz <zhangkai@iscas.ac.cn>
Date: Sat, 1 Jun 2024 13:04:38 +0800
Subject: [PATCH] add riscv64 to lib64 matches
---
cmake/install.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/install.cmake b/cmake/install.cmake
index 90bae8b..264e2ac 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -76,7 +76,7 @@ SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient")
# RPM layout
#
SET(INSTALL_BINDIR_RPM "bin")
-IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x" OR CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64") AND CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(INSTALL_LIBDIR_RPM "lib64/mariadb")
SET(INSTALL_PCDIR_RPM "lib64/pkgconfig")
SET(INSTALL_PLUGINDIR_RPM "lib64/mariadb/plugin")
--
2.39.2

View File

@ -1,25 +0,0 @@
From 1fb8e24afd7849ac7e5c4644ecc72a5be86504d4 Mon Sep 17 00:00:00 2001
From: maqi <maqi@uniontech.com>
Date: Fri, 28 Feb 2025 09:50:49 +0800
Subject: [PATCH] add sw64 to lib64 matches
---
cmake/install.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/install.cmake b/cmake/install.cmake
index 264e2ac..f6d2a7e 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -76,7 +76,7 @@ SET(LIBMARIADB_STATIC_DEFAULT "mariadbclient")
# RPM layout
#
SET(INSTALL_BINDIR_RPM "bin")
-IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x" OR CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64") AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x" OR CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "sw_64") AND CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(INSTALL_LIBDIR_RPM "lib64/mariadb")
SET(INSTALL_PCDIR_RPM "lib64/pkgconfig")
SET(INSTALL_PLUGINDIR_RPM "lib64/mariadb/plugin")
--
2.39.3

Binary file not shown.

Binary file not shown.

View File

@ -1,14 +1,12 @@
Name: mariadb-connector-c
Version: 3.3.8
Release: 3
Version: 3.1.21
Release: 7
Summary: MariaDB connector library in C
License: LGPLv2+
URL: https://github.com/MariaDB/mariadb-connector-c
Source0: https://downloads.mariadb.com/Connectors/c/connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz
Patch0003: mariadb-connector-c-3.1.13-src-sw.patch
Patch0004: add-riscv64-to-lib64-matches.patch
Patch0005: add-sw64-to-lib64-matches.patch
BuildRequires: libcurl-devel zlib-devel openssl-devel
BuildRequires: cmake gcc
@ -93,29 +91,13 @@ end
%dir %{_includedir}/mysql
%{_includedir}/mysql/*
%{_libdir}/*.so
%ifarch loongarch64
%ifarch loongarch64 riscv64
%{_prefix}/lib/pkgconfig/libmariadb.pc
%else
%{_libdir}/pkgconfig/libmariadb.pc
%endif
%{_mandir}/man3/{mariadb,mysql}_*.3*
%changelog
* Fri Feb 28 2025 maqi <maqi@uniontech.com> - 3.3.8-3
- add sw64 to lib64 matches
* Mon Jun 03 2024 laokz <zhangkai@iscas.ac.cn> - 3.3.8-2
- add riscv64 to lib64 matches
* Tue Feb 06 2024 Jiangtian Feng <fengjiangtian@huawei.com> - 3.3.8-1
- update package to 3.3.8
* Fri Jun 16 2023 dillon chen <dillon.chen@gmail.com> - 3.3.5-1
- update package to 3.3.5
* Thu Jun 15 2023 dillon chen <dillon.chen@gmail.com> - 3.2.7-1
- update package to 3.2.7
* Fri Jun 9 2023 dillon chen <dillon.chen@gmail.com> - 3.1.21-1
- update package to 3.1.21