automatic version update by autodist [release 10.5.9-1mamba;Wed Feb 17 2021]

mariadb-10.5.9-fix-cmake-ConnectorName-syntax.patch

@@ -0,0 +1,11 @@
+--- mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake.orig	2021-03-31 13:27:51.871737488 +0200
++++ mariadb-10.5.9/libmariadb/cmake/ConnectorName.cmake	2021-03-31 13:28:00.523636799 +0200
+@@ -22,7 +22,7 @@
+     SET(MACHINE_NAME "x64")
+   ELSE()
+     SET(MACHINE_NAME "32")
+-  END()
++  ENDIF()
+ ENDIF()
+ 
+ SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")

mariadb.spec

@@ -5,7 +5,7 @@
 %define userid  65018
 
 Name:          mariadb
-Version:       10.5.8
+Version:       10.5.9
 Release:       1mamba
 Summary:       A SQL database engine designed as a drop-in replacement of MySQL(R)
 Group:         Applications/Databases
@@ -22,6 +22,7 @@ Source3:       mariadb-logrotate
 #Source4:       mysql-initscript
 #Patch0:        mysql-4.1.19-CVE-2006-0903.patch
 #Patch1:        %{name}-5.1.45-skip-abi-check.patch
+Patch2:        mariadb-10.5.9-fix-cmake-ConnectorName-syntax.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -56,9 +57,8 @@ BuildRequires: tetex-latex
 #Requires(post):%{__install_info}
 Requires:      %{name}-common = %{?epoch:%epoch:}%{version}-%{release}
 #Requires:      lsb
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 Provides:      mysql
-Obsoletes:     mysql
+Obsoletes:     mysql < 10.5.9
 %systemd_requires
 
 %description
@@ -70,7 +70,7 @@ Group:         Applications/Databases
 Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 Requires:      %{name}-client = %{?epoch:%epoch:}%{version}-%{release}
 Provides:      mysql-server
-Obsoletes:     mysql-server
+Obsoletes:     mysql-server < 10.5.9
 
 %description server
 MariaDB is designed as a drop-in replacement of MySQL(R) with more features, new storage engines, fewer bugs, and better performance.
@@ -81,7 +81,7 @@ Summary:       MariaDB client
 Group:         Applications/Databases
 Requires:      %{name}-common = %{?epoch:%epoch:}%{version}-%{release}
 Provides:      mysql-client
-Obsoletes:     mysql-client
+Obsoletes:     mysql-client < 10.5.9
 
 %description client
 MariaDB is designed as a drop-in replacement of MySQL(R) with more features, new storage engines, fewer bugs, and better performance.
@@ -92,7 +92,7 @@ Summary:       MySQL benchmarks and test system
 Group:         Applications/Databases
 Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 Provides:      mysql-bench
-Obsoletes:     mysql-bench
+Obsoletes:     mysql-bench < 10.5.9
 
 %description bench
 MariaDB is designed as a drop-in replacement of MySQL(R) with more features, new storage engines, fewer bugs, and better performance.
@@ -102,8 +102,8 @@ This package contains MariaDB benchmark scripts and data.
 Summary:       Common files for the MariaDB database server
 Group:         Applications/Databases
 Provides:      mysql-common
-Obsoletes:     mysql-common
-Obsoletes:     mariadb-columnstore
+Obsoletes:     mysql-common < 10.5.9
+Obsoletes:     mariadb-columnstore < 10.5.9
 Requires:      lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
 
 %description common
@@ -114,9 +114,9 @@ This package contains common files for the MariaDB database server.
 Summary:       Shared libraries need to dynamically load and use MariaDB
 Group:         System/Libraries
 Provides:      libmysql
-Obsoletes:     libmysql
+Obsoletes:     libmysql < 10.5.9
 Provides:      libmysqlclient
-Obsoletes:     libmysqlclient
+Obsoletes:     libmysqlclient < 10.5.9
 %ifarch x86_64
 Provides:      libmysqlclient.so.18()(64bit)
 Provides:      libmysqlclient.so.18(libmariadbclient_18)(64bit)
@@ -139,11 +139,11 @@ Summary:       Development header files and static libraries for MariaDB
 Group:         Development/Libraries
 Requires:      libmysqlclient = %{?epoch:%epoch:}%{version}-%{release}
 Provides:      libmysql-devel
-Obsoletes:     libmysql-devel
+Obsoletes:     libmysql-devel < 10.5.9
 Provides:      libmysql5-devel
-Obsoletes:     libmysql5-devel
+Obsoletes:     libmysql5-devel < 10.5.9
 Provides:      libmysqlclient-devel
-Obsoletes:     libmysqlclient-devel
+Obsoletes:     libmysqlclient-devel < 10.5.9
 
 %description -n lib%{name}-devel
 MariaDB is designed as a drop-in replacement of MySQL(R) with more features, new storage engines, fewer bugs, and better performance.
@@ -152,11 +152,11 @@ This package contains the development header files and libraries necessary to de
 %debug_package
 
 %prep
-%setup -q
-#-D -T
+%setup -q -D -T
+:<< _EOF
+%patch2 -p1
 
 %build
-#:<< _EOF
 %cmake -d build \
    -DBUILD_CONFIG=mysql_release \
    -DSYSCONFDIR=%{_sysconfdir}/mysql \
@@ -196,7 +196,10 @@ This package contains the development header files and libraries necessary to de
    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
    -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
    -DCMAKE_C_FLAGS="-fPIC %{optflags} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \
-   -DCMAKE_CXX_FLAGS="-fPIC %{optflags} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-delete-null-pointer-checks"
+   -DCMAKE_CXX_FLAGS="-fPIC %{optflags} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-delete-null-pointer-checks" \
+%ifarch arm
+   -DCONNECT_WITH_JDBC=OFF
+%endif
 
 #-fno-rtti 
 #   -DWITH_MYSQLD_LDFLAGS="-pie ${LDFLAGS},-z,now"
@@ -615,7 +618,7 @@ fi
 %{_libdir}/libmysqlclient.so.18
 /%{_lib}/security/pam_user_map.so
 %{_libdir}/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
-%ifnarch aarch64
+%ifnarch arm
 %{_libdir}/mysql/plugin/JdbcInterface.jar
 %{_libdir}/mysql/plugin/JavaWrappers.jar
 %endif
@@ -647,6 +650,9 @@ fi
 %{_mandir}/man1/mariadb_config.1*
 
 %changelog
+* Wed Feb 17 2021 Automatic Build System <autodist@mambasoft.it> 10.5.9-1mamba
+- automatic version update by autodist
+
 * Thu Nov 19 2020 Automatic Build System <autodist@mambasoft.it> 10.5.8-1mamba
 - automatic version update by autodist