updated 2 packages

galera-26.4.5-1

mariadb-10.5.5-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12464 ec354946-7b23-47d6-9f5a-488ba84defc7

g/galera/galera-vl.spec

@@ -1,8 +1,7 @@
 %bcond_with		systemd
 %bcond_with		python3
 
-%define galera_api_version 26.4
-%define mariadb_version 10.4.13
+%define mariadb_version 10.5.5
 
 %if %{with python3}
 %global scons scons-3
@@ -10,18 +9,20 @@
 %global scons scons
 %endif
 
+Summary:        Synchronous multi-master wsrep provider (replication engine)
 Name:           galera
-Version:        %{galera_api_version}.4
+Version:        26.4.5
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
-Summary:        Synchronous multi-master wsrep provider (replication engine)
+%global         galera_api_version %(echo %{version} | cut -d . -f 1,2)
+Group:          servers
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 License:        GPLv2
 URL:            http://galeracluster.com/
-
 # Actually, the truth is, we do use galera source tarball provided by MariaDB on
 # following URL (without macros):
 #   https://mirror.vpsfree.cz/mariadb/mariadb-10.2.13/galera-25.3.23/src/galera-25.3.23.tar.gz
-
 Source0:        https://downloads.mariadb.com/MariaDB/mariadb-%{mariadb_version}/galera-%{version}/src/%{name}-%{version}.tar.gz
 
 Source1:        garbd.service
@@ -81,7 +82,6 @@ install -D -m 755 garb/garbd %{buildroot}%{_sbindir}/garbd
 install -D -m 755 libgalera_smm.so %{buildroot}%{_libdir}/galera/libgalera_smm.so
 install -D -m 644 garb/files/garb.cnf %{buildroot}%{_sysconfdir}/sysconfig/garb
 install -D -m 644 COPYING %{buildroot}%{_docdir}/galera/COPYING
-install -D -m 644 chromium/LICENSE %{buildroot}%{_docdir}/galera/LICENSE.chromium
 install -D -m 644 asio/LICENSE_1_0.txt %{buildroot}%{_docdir}/galera/LICENSE.asio
 install -D -m 644 www.evanjones.ca/LICENSE %{buildroot}%{_docdir}/galera/LICENSE.crc32
 install -D -m 644 scripts/packages/README %{buildroot}%{_docdir}/galera/README
@@ -114,6 +114,11 @@ fi
 
 
 %files
+%license %{_docdir}/galera/COPYING
+%license %{_docdir}/galera/LICENSE.asio
+%license %{_docdir}/galera/LICENSE.crc32
+%doc %{_docdir}/galera/README
+%doc %{_docdir}/galera/README-MySQL
 %config(noreplace,missingok) %{_sysconfdir}/sysconfig/garb
 %dir %{_docdir}/galera
 %dir %{_libdir}/galera
@@ -125,15 +130,12 @@ fi
 %{_initdir}/garbd
 %endif
 %{_libdir}/galera/libgalera_smm.so
-%license %{_docdir}/galera/COPYING
-%license %{_docdir}/galera/LICENSE.asio
-%license %{_docdir}/galera/LICENSE.crc32
-%license %{_docdir}/galera/LICENSE.chromium
-%doc %{_docdir}/galera/README
-%doc %{_docdir}/galera/README-MySQL
 
 
 %changelog
+* Wed Aug 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 26.4.5-1
+- new upstream release.
+
 * Thu May 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 26.4.4-1
 - new upstream release.
 

m/mariadb/mariadb-vl.spec

@@ -1,6 +1,7 @@
 %bcond_with systemd
 %bcond_with source
 %bcond_without onigmo
+%bcond_with tokudb
 
 %global daemon_name mariadb
 
@@ -14,10 +15,10 @@
 
 %define _unpackaged_files_terminate_build 1
 
-%define mariadb_version		10.4.13
-%define mariadb_base_version	10.4
-%define mroonga_version		10.02
-%define groonga_version		10.0.2
+%define mariadb_version		10.5.5
+%define mariadb_base_version	10.5
+%define mroonga_version		10.05
+%define groonga_version		10.0.5
 %define client_version		18
 
 %define galera_api_version	26.4
@@ -26,7 +27,7 @@ Name:		mariadb
 Summary:	MariaDB: a very fast and robust SQL database server
 Version:	%{mariadb_version}
 Release:	1%{_dist_release}%{?with_systemd:.systemd}
-Group:		Applications/Databases
+Group:		servers
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Packager:	tomop
@@ -50,14 +51,13 @@ Source1000:	macros.mariadb.in
 
 Patch0:		mariadb-scripts.patch
 # replace mroonga to the newest version.
-#patch1000: mariadb-%{mariadb_version}-mroonga-master.patch
 Patch1000: 0001-MariaDB-%{mariadb_version}-Mroonga-v%{mroonga_version}-Groonga-v%{groonga_version}.patch
-#Patch1001: mroonga_for_mariadb-10.2.patch
+Patch1001: mariadb-10.5.5-fix-FTBFS.patch
 
 #
 #Patch2000:	mysql-srv_buf_size.patch
 
-BuildRoot:		%{_tmppath}/%{name}-%{version}-root
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	bison, cmake, gcc-c++, groff, git
 BuildRequires:	libaio-devel, libboost-devel, libevent-devel, libxml2-devel
 BuildRequires:	ncurses-devel, perl, openssl-devel, readline-devel
@@ -67,9 +67,9 @@ BuildRequires:	unixODBC-devel
 BuildRequires:	zlib-devel
 BuildRequires:	mecab-devel
 BuildRequires:	lz4-devel
-Requires:		fileutils sh-utils
-Provides:		msqlormysql MySQL mysql
-Obsoletes:		mysql MySQL5
+Requires:	fileutils sh-utils
+Provides:	msqlormysql MySQL mysql
+Obsoletes:	mysql MySQL5
 %if %{with systemd}
 BuildRequires:	systemd
 BuildRequires:	systemd-devel
@@ -91,15 +91,16 @@ MariaDB bug reports should be submitted through https://mariadb.atlassian.net/
 
 
 %package server
+Summary:	MariaDB: a very fast and robust SQL database server
 Version:	%{mariadb_version}
 Release:	%{release}
-Summary:	MariaDB: a very fast and robust SQL database server
-Group:		Applications/Databases
+Group:		servers
 Requires:	fileutils sh-utils net-tools mariadb-common
 Requires(post):	mariadb-common
 Provides:	mysql-server mysql MySQL MySQL-server mariadbserver-%{mariadb_base_version}
 Obsoletes:	MySQL mysql mysql-server
 Obsoletes:	MySQL-server < 5.6.0
+Obsoletes:	mariadb-tokudb < 10.5.5
 
 %description server
 MariaDB: a very fast and robust SQL database server
@@ -113,9 +114,9 @@ MariaDB bug reports should be submitted through https://mariadb.atlassian.net/
 
 %package mroonga
 ##Version: %{mroonga_version}
-Version:	%{mariadb_version}
 Summary:	A fast fulltext searchable storage engine for MariaDB.
-Group:		Applications/Databases
+Version:	%{mariadb_version}
+Group:		servers
 Requires(pre):	mariadb-server = %{mariadb_version}-%{release}
 Requires:	mariadb-server = %{mariadb_version}-%{release}
 Obsoletes:	MySQL-mroonga < 4.02
@@ -129,9 +130,9 @@ column store. Groonga is good at real-time update.
 
 
 %package connect
-Version:	%{mariadb_version}
 Summary:	CONNECT storage engine for MariaDB.
-Group:		Applications/Databases
+Version:	%{mariadb_version}
+Group:		servers
 Requires(pre):	mariadb-server = %{mariadb_version}-%{release}
 Requires:	mariadb-server = %{mariadb_version}-%{release}
 
@@ -149,9 +150,9 @@ FILEID, and SERVID.
 
 
 %package galera
-Version:	%{mariadb_version}
 Summary:	The configuration files and scripts for galera replication
-Group:		Applications/Databases
+Version:	%{mariadb_version}
+Group:		servers
 Provides:	mariadb-server-galera = %{mariadb_version}-%{release}
 Requires(pre):	mariadb-server = %{mariadb_version}-%{release}
 Requires:	mariadb-server = %{mariadb_version}-%{release}
@@ -162,10 +163,11 @@ Requires:	galera(%{galera_api_version})
 
 
 %ifarch x86_64
+%if %{with tokudb}
 %package tokudb
-Version:	%{mariadb_version}
 Summary:	TokuDB storage engine for MariaDB.
-Group:		Applications/Databases
+Version:	%{mariadb_version}
+Group:		servers
 Requires(pre):	mariadb-server = %{mariadb_version}-%{release}
 Requires:	mariadb-server = %{mariadb_version}-%{release}
 
@@ -175,12 +177,13 @@ write-intensive environments, offering increased compression and
 better performance.
 
 %endif
+%endif
 
 
 %package client
-Version:	%{mariadb_version}
 Summary: MariaDB - Client
-Group: Applications/Databases
+Version: %{mariadb_version}
+Group: office
 Obsoletes: mysql-client MySQL-client < 5.6.0
 Provides: mysql-client MySQL-client  mariadbclient-%{mariadb_base_version}
 
@@ -189,9 +192,9 @@ This package contains the standard MariaDB clients and administration tools.
 
 
 %package devel
-Version:	%{mariadb_version}
 Summary: MariaDB - Development libraries and headers
-Group: Development/Libraries
+Version: %{mariadb_version}
+Group: programming
 Requires: %{name}-static, openssl-devel, zlib-devel
 Conflicts: MySQL-devel < 5.6.0
 Conflicts: libmysqlclient-devel
@@ -203,9 +206,9 @@ MariaDB server components (e.g. plugins or embedded applications).
 
 
 %package static
-Version:	%{mariadb_version}
 Summary: MariaDB - static libraries
-Group: Development/Libraries
+Version: %{mariadb_version}
+Group: programming
 Requires: %{name}-devel
 
 %description static
@@ -214,9 +217,9 @@ This package provides static libraries of MariaDB.
 
 %if %{with source}
 %package source
-Version:	%{mariadb_version}
 Summary: MariaDB - Source
-Group: Development/Libraries
+Version: %{mariadb_version}
+Group: programming
 Requires: mariadb-devel = %{version}-%{release}
 Obsoletes: MySQL-source < 5.6.0
 AutoReqProv: no
@@ -228,10 +231,10 @@ This package contains the sources files of MariaDB.
 
 
 %package test
-Version:	%{mariadb_version}
-Requires: %{name}-client = %{version}-%{release} perl-DBI perl
 Summary: MariaDB - Test suite
-Group: Applications/Databases
+Version: %{mariadb_version}
+Group: admin-tools
+Requires: %{name}-client = %{version}-%{release} perl-DBI perl
 Obsoletes: mysql-bench MySQL5-bench MySQL-bench MySQL-test < 5.6.0
 Provides: perl(mtr_misc.pl)
 
@@ -240,9 +243,9 @@ This package contains the MariaDB regression test suite.
 
 
 %package embedded
-Version:	%{mariadb_version}
 Summary: MariaDB as an embeddable library
-Group: System Environment/Libraries
+Version: %{mariadb_version}
+Group: system
 Obsoletes: mysql-embedded MySQL-embedded
 Provides: mysql-embedded MySQL-embedded
 
@@ -260,6 +263,10 @@ into a client application instead of running as a separate process.
 %patch0 -p1
 %endif
 git --git-dir= apply -p1 %{PATCH1000}
+pushd ./storage/mroonga/
+%patch1001 -p1
+popd
+
 cp -f \
 	%{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE14} \
 	%{SOURCE15} %{SOURCE16} %{SOURCE18} \
@@ -274,7 +281,7 @@ set -eu
 touch optional-files-devel
 
 export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
-export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-rtti}}
+export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS}}
 
 # Build full release
 # workaround: force TOKUDB_OK=1
@@ -299,7 +306,13 @@ mkdir release
       -DWITH_XTRADB_STORAGE_ENGINE="ON" \
       -DWITH_JEMALLOC="yes" \
 %ifarch x86_64
+%if %{with tokudb}
       -DTOKUDB_OK=1 \
+      -DPLUGIN_TOKUDB="DYNAMIC" \
+%else
+      -DTOKUDB_OK=0 \
+      -DPLUGIN_TOKUDB="NO" \
+%endif
 %endif
       -DGRN_WITH_MECAB="yes" \
 %if %{without onigmo}
@@ -345,6 +358,7 @@ install -p -m 755 scripts/mysql-check-socket %{buildroot}%{_libexecdir}/mysql-ch
 install -p -m 755 scripts/mysql-check-upgrade %{buildroot}%{_libexecdir}/mysql-check-upgrade
 install -p -m 644 scripts/mysql-scripts-common %{buildroot}%{_libexecdir}/mysql-scripts-common
 popd
+mkdir -p %{buildroot}%{_unitdir}/mariadb.service.d
 %else
 # drop systemd files.
 rm -rf %{buildroot}%{_sysconfdir}/systemd
@@ -378,13 +392,14 @@ rm -f %{buildroot}%{_libdir}/libmysqlclient*.so*
 rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
 
 %ifarch x86_64
+%if %{with tokudb}
 pushd release
 install -m644 ./storage/tokudb/tokudb.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/
 popd
 %if %{with systemd}
-mkdir -p %{buildroot}%{_unitdir}/mariadb.service.d
 mv %{buildroot}/etc/systemd/system/mariadb.service.d/tokudb.conf %{buildroot}%{_unitdir}/mariadb.service.d/tokudb.conf
 %endif
+%endif
 %else
 rm -f %{buildroot}%{_mandir}/man1/tokuft*
 %endif
@@ -564,21 +579,22 @@ fi
 %doc %{_mandir}/man1/aria_*.1*
 %doc %{_mandir}/man1/innochecksum.1*
 %doc %{_mandir}/man1/mariabackup.1*
-%doc %{_mandir}/man1/mariadb-backup.1.gz
-%doc %{_mandir}/man1/mariadb-convert-table-format.1.gz
-%doc %{_mandir}/man1/mariadb-dumpslow.1.gz
-%doc %{_mandir}/man1/mariadb-fix-extensions.1.gz
-%doc %{_mandir}/man1/mariadb-hotcopy.1.gz
-%doc %{_mandir}/man1/mariadb-install-db.1.gz
-%doc %{_mandir}/man1/mariadb-ldb.1.gz
-%doc %{_mandir}/man1/mariadb-secure-installation.1.gz
+%doc %{_mandir}/man1/mariadb-backup.1*
+%doc %{_mandir}/man1/mariadb-convert-table-format.1*
+%doc %{_mandir}/man1/mariadb-conv.1*
+%doc %{_mandir}/man1/mariadb-dumpslow.1*
+%doc %{_mandir}/man1/mariadb-fix-extensions.1*
+%doc %{_mandir}/man1/mariadb-hotcopy.1*
+%doc %{_mandir}/man1/mariadb-install-db.1*
+%doc %{_mandir}/man1/mariadb-ldb.1*
+%doc %{_mandir}/man1/mariadb-secure-installation.1*
 %doc %{_mandir}/man1/mariadb-service-convert.1*
-%doc %{_mandir}/man1/mariadb-setpermission.1.gz
-%doc %{_mandir}/man1/mariadb-tzinfo-to-sql.1.gz
-%doc %{_mandir}/man1/mariadb-upgrade.1.gz
-%doc %{_mandir}/man1/mariadbd-multi.1.gz
-%doc %{_mandir}/man1/mariadbd-safe-helper.1.gz
-%doc %{_mandir}/man1/mariadbd-safe.1.gz
+%doc %{_mandir}/man1/mariadb-setpermission.1*
+%doc %{_mandir}/man1/mariadb-tzinfo-to-sql.1*
+%doc %{_mandir}/man1/mariadb-upgrade.1*
+%doc %{_mandir}/man1/mariadbd-multi.1*
+%doc %{_mandir}/man1/mariadbd-safe-helper.1*
+%doc %{_mandir}/man1/mariadbd-safe.1*
 %doc %{_mandir}/man1/mbstream.1*
 %doc %{_mandir}/man1/my_print_defaults.1*
 %doc %{_mandir}/man1/my_safe_process.1*
@@ -586,6 +602,7 @@ fi
 %doc %{_mandir}/man1/myisamchk.1*
 %doc %{_mandir}/man1/myisamlog.1*
 %doc %{_mandir}/man1/myisampack.1*
+%doc %{_mandir}/man1/myrocks_hotbackup.1*
 %doc %{_mandir}/man1/mysql_convert_table_format.1*
 %doc %{_mandir}/man1/mysql_fix_extensions.1*
 %doc %{_mandir}/man1/mysqld_multi.1*
@@ -607,11 +624,12 @@ fi
 %doc %{_mandir}/man1/resolveip.1*
 %doc %{_mandir}/man1/wsrep_sst_*.1*
 %doc %{_mandir}/man8/mysqld.8*
-%doc %{_mandir}/man8/mariadbd.8.gz
+%doc %{_mandir}/man8/mariadbd.8*
 %{_bindir}/aria_*
 %{_bindir}/innochecksum
 %{_bindir}/mariabackup
 %{_bindir}/mariadb-backup
+%{_bindir}/mariadb-conv
 %{_bindir}/mariadb-convert-table-format
 %{_bindir}/mariadb-dumpslow
 %{_bindir}/mariadb-fix-extensions
@@ -664,6 +682,7 @@ fi
 %dir %{_sysconfdir}/my.cnf.d
 %config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset
 %config(noreplace) %{_sysconfdir}/my.cnf.d/server.cnf
+%config(noreplace) %{_sysconfdir}/my.cnf.d/spider.cnf
 %config(noreplace) %{_sysconfdir}/security/user_map.conf
 %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
 %if %{with systemd}
@@ -683,8 +702,10 @@ fi
 %{_bindir}/myrocks_hotbackup
 %{_bindir}/mysql_ldb
 %{_bindir}/sst_dump
+%if %{with tokudb}
 %exclude %{_libdir}/mysql/plugin/ha_tokudb.so
 %endif
+%endif
 
 %files mroonga
 %defattr(-, root, root)
@@ -711,6 +732,7 @@ fi
 %endif
 
 %ifarch x86_64
+%if %{with tokudb}
 %files tokudb
 %defattr(-, root, root)
 %dir %{_sysconfdir}/my.cnf.d
@@ -722,6 +744,7 @@ fi
 %{_unitdir}/mariadb.service.d/tokudb.conf
 %endif
 %endif
+%endif
 
 %files client
 %defattr(-, root, root)
@@ -755,18 +778,18 @@ fi
 %{_bindir}/mysqlshow
 %{_bindir}/mysqlslap
 %{_bindir}/mytop
-%doc %{_mandir}/man1/mariadb.1.gz
-%doc %{_mandir}/man1/mariadb-access.1.gz
-%doc %{_mandir}/man1/mariadb-admin.1.gz
-%doc %{_mandir}/man1/mariadb-binlog.1.gz
-%doc %{_mandir}/man1/mariadb-check.1.gz
-%doc %{_mandir}/man1/mariadb-dump.1.gz
-%doc %{_mandir}/man1/mariadb-find-rows.1.gz
-%doc %{_mandir}/man1/mariadb-import.1.gz
-%doc %{_mandir}/man1/mariadb-plugin.1.gz
-%doc %{_mandir}/man1/mariadb-show.1.gz
-%doc %{_mandir}/man1/mariadb-slap.1.gz
-%doc %{_mandir}/man1/mariadb-waitpid.1.gz
+%doc %{_mandir}/man1/mariadb.1*
+%doc %{_mandir}/man1/mariadb-access.1*
+%doc %{_mandir}/man1/mariadb-admin.1*
+%doc %{_mandir}/man1/mariadb-binlog.1*
+%doc %{_mandir}/man1/mariadb-check.1*
+%doc %{_mandir}/man1/mariadb-dump.1*
+%doc %{_mandir}/man1/mariadb-find-rows.1*
+%doc %{_mandir}/man1/mariadb-import.1*
+%doc %{_mandir}/man1/mariadb-plugin.1*
+%doc %{_mandir}/man1/mariadb-show.1*
+%doc %{_mandir}/man1/mariadb-slap.1*
+%doc %{_mandir}/man1/mariadb-waitpid.1*
 %doc %{_mandir}/man1/msql2mysql.1*
 %doc %{_mandir}/man1/mysql.1*
 %doc %{_mandir}/man1/mysql_find_rows.1*
@@ -780,10 +803,12 @@ fi
 %doc %{_mandir}/man1/mysql_plugin.1*
 %doc %{_mandir}/man1/mysqlshow.1*
 %doc %{_mandir}/man1/mysqlslap.1*
+%doc %{_mandir}/man1/mytop.1*
 
 %files devel
 %defattr(-, root, root)
 %doc %{_mandir}/man1/mysql_config.1*
+%{_bindir}/mariadb-config
 %{_bindir}/mariadb_config
 %{_bindir}/mysql_config
 %{_includedir}/mysql
@@ -794,7 +819,8 @@ fi
 %{_sysconfdir}/rpm/*
 %{_bindir}/mariadb-embedded
 %{_bindir}/mysql_embedded
-%doc %{_mandir}/man1/mariadb-embedded.1.gz
+%doc %{_mandir}/man1/mariadb_config.1*
+%doc %{_mandir}/man1/mariadb-embedded.1*
 %doc %{_mandir}/man1/mysql_embedded.1*
 
 %files static
@@ -818,10 +844,10 @@ fi
 %{_bindir}/mysql_client_test_embedded
 %{_bindir}/mysqltest_embedded
 %{_bindir}/test-connect-t
-%doc %{_mandir}/man1/mariadb-client-test-embedded.1.gz
-%doc %{_mandir}/man1/mariadb-client-test.1.gz
-%doc %{_mandir}/man1/mariadb-test-embedded.1.gz
-%doc %{_mandir}/man1/mariadb-test.1.gz
+%doc %{_mandir}/man1/mariadb-client-test-embedded.1*
+%doc %{_mandir}/man1/mariadb-client-test.1*
+%doc %{_mandir}/man1/mariadb-test-embedded.1*
+%doc %{_mandir}/man1/mariadb-test.1*
 %doc %{_mandir}/man1/mysql_client_test.1*
 %doc %{_mandir}/man1/mysql-stress-test.pl.1*
 %doc %{_mandir}/man1/mysql-test-run.pl.1*
@@ -834,6 +860,13 @@ fi
 
 
 %changelog
+
+* Wed Aug 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.5.5-1
+- new upstream release.
+- replaced patch1000 to update Groonga to v10.0.5.
+- added Patch1001 to fix FTBFS.
+- disabled tokudb as default.
+
 * Thu May 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.4.13-1
 - new upstream release.
 - replaced patch1000 to update Groonga to v10.0.2.