|
|
@@ -1,6 +1,9 @@
|
|
|
+%bcond_with systemd
|
|
|
%bcond_with source
|
|
|
%bcond_without onigmo
|
|
|
|
|
|
+%global daemon_name mariadb
|
|
|
+
|
|
|
%define mysqld_user mysql
|
|
|
%define mysqld_group mysql
|
|
|
%define mysqldatadir /var/lib/mysql
|
|
|
@@ -11,32 +14,41 @@
|
|
|
|
|
|
%define _unpackaged_files_terminate_build 1
|
|
|
|
|
|
+%define mariadb_version 10.4.13
|
|
|
%define mariadb_base_version 10.4
|
|
|
-%define mariadb_version 10.4.12
|
|
|
-%define mroonga_version 9.12
|
|
|
-%define groonga_version 9.1.2
|
|
|
+%define mroonga_version 10.02
|
|
|
+%define groonga_version 10.0.2
|
|
|
%define client_version 18
|
|
|
|
|
|
%define galera_api_version 26.4
|
|
|
|
|
|
-Vendor: Project Vine
|
|
|
-Distribution: Vine Linux
|
|
|
-Packager: tomop
|
|
|
-
|
|
|
-Name: mariadb
|
|
|
+Name: mariadb
|
|
|
Summary: MariaDB: a very fast and robust SQL database server
|
|
|
Version: %{mariadb_version}
|
|
|
-Release: 1%{_dist_release}
|
|
|
-
|
|
|
+Release: 1%{_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: Applications/Databases
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
+Packager: tomop
|
|
|
+
|
|
|
License: GPL2
|
|
|
URL: https://mariadb.org/
|
|
|
-
|
|
|
Source: https://downloads.mariadb.com/MariaDB/mariadb-%{version}/source/mariadb-%{version}.tar.gz
|
|
|
+
|
|
|
+# for systemd
|
|
|
+Source10: mysql.tmpfiles.d.in
|
|
|
+Source11: mysql.service.in
|
|
|
+Source12: mysql-prepare-db-dir.sh
|
|
|
+Source14: mysql-check-socket.sh
|
|
|
+Source15: mysql-scripts-common.sh
|
|
|
+Source16: mysql-check-upgrade.sh
|
|
|
+Source18: mysql@.service.in
|
|
|
+
|
|
|
# Don't depend on lib::mtr*
|
|
|
Source998: perl-requires.sh
|
|
|
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
|
|
|
@@ -58,6 +70,14 @@ BuildRequires: lz4-devel
|
|
|
Requires: fileutils sh-utils
|
|
|
Provides: msqlormysql MySQL mysql
|
|
|
Obsoletes: mysql MySQL5
|
|
|
+%if %{with systemd}
|
|
|
+BuildRequires: systemd
|
|
|
+BuildRequires: systemd-devel
|
|
|
+%{?systemd_requires}
|
|
|
+%else
|
|
|
+Requires(post): chkconfig
|
|
|
+Requires(preun): chkconfig
|
|
|
+%endif
|
|
|
|
|
|
# From the manual
|
|
|
%description
|
|
|
@@ -90,6 +110,7 @@ conditions of the GNU General Public License Version 2 (http://www.gnu.org/licen
|
|
|
MariaDB documentation can be found at http://kb.askmonty.org/
|
|
|
MariaDB bug reports should be submitted through https://mariadb.atlassian.net/
|
|
|
|
|
|
+
|
|
|
%package mroonga
|
|
|
##Version: %{mroonga_version}
|
|
|
Version: %{mariadb_version}
|
|
|
@@ -106,6 +127,7 @@ Mroonga is a fast fulltext searchable storage plugin for MariaDB.
|
|
|
It is based on groonga that is a fast fulltext search engine and
|
|
|
column store. Groonga is good at real-time update.
|
|
|
|
|
|
+
|
|
|
%package connect
|
|
|
Version: %{mariadb_version}
|
|
|
Summary: CONNECT storage engine for MariaDB.
|
|
|
@@ -125,6 +147,7 @@ This storage engine supports table partitioning, MariaDB virtual
|
|
|
columns and also permits defining special columns such as ROWID,
|
|
|
FILEID, and SERVID.
|
|
|
|
|
|
+
|
|
|
%package galera
|
|
|
Version: %{mariadb_version}
|
|
|
Summary: The configuration files and scripts for galera replication
|
|
|
@@ -137,6 +160,7 @@ Requires: galera(%{galera_api_version})
|
|
|
%description galera
|
|
|
This package contains the files for MariaDB Galera Cluster.
|
|
|
|
|
|
+
|
|
|
%ifarch x86_64
|
|
|
%package tokudb
|
|
|
Version: %{mariadb_version}
|
|
|
@@ -152,6 +176,7 @@ better performance.
|
|
|
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
%package client
|
|
|
Version: %{mariadb_version}
|
|
|
Summary: MariaDB - Client
|
|
|
@@ -186,6 +211,7 @@ Requires: %{name}-devel
|
|
|
%description static
|
|
|
This package provides static libraries of MariaDB.
|
|
|
|
|
|
+
|
|
|
%if %{with source}
|
|
|
%package source
|
|
|
Version: %{mariadb_version}
|
|
|
@@ -200,6 +226,7 @@ This package contains the sources files of MariaDB.
|
|
|
|
|
|
%endif
|
|
|
|
|
|
+
|
|
|
%package test
|
|
|
Version: %{mariadb_version}
|
|
|
Requires: %{name}-client = %{version}-%{release} perl-DBI perl
|
|
|
@@ -224,13 +251,22 @@ This package contains a version of the MariaDB server that can be embedded
|
|
|
into a client application instead of running as a separate process.
|
|
|
|
|
|
|
|
|
+%debug_package
|
|
|
+
|
|
|
+
|
|
|
%prep
|
|
|
%setup -q
|
|
|
+%if %{with systemd}
|
|
|
+%patch0 -p1
|
|
|
+%endif
|
|
|
git --git-dir= apply -p1 %{PATCH1000}
|
|
|
-#patch1000 -p1 -b .mroonga
|
|
|
+cp -f \
|
|
|
+ %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE14} \
|
|
|
+ %{SOURCE15} %{SOURCE16} %{SOURCE18} \
|
|
|
+ scripts/
|
|
|
|
|
|
-%build
|
|
|
|
|
|
+%build
|
|
|
# Be strict about variables, bail at earliest opportunity, etc.
|
|
|
set -eu
|
|
|
|
|
|
@@ -292,11 +328,34 @@ install -d %{buildroot}%{_infodir}
|
|
|
make DESTDIR=%{buildroot} install
|
|
|
)
|
|
|
|
|
|
+%if %{with systemd}
|
|
|
+install -d %{buildroot}%{_libexecdir}
|
|
|
+pushd release
|
|
|
+rm -rf %{buildroot}/usr/lib/systemd/system
|
|
|
+# install systemd unit files and scripts for handling server startup
|
|
|
+install -D -p -m 644 scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service
|
|
|
+install -D -p -m 644 scripts/mysql@.service %{buildroot}%{_unitdir}/%{daemon_name}.service
|
|
|
+# Remove the upstream version
|
|
|
+rm -f %{buildroot}%{_tmpfilesdir}/tmpfiles.conf
|
|
|
+# Install downstream version
|
|
|
+install -D -p -m 0644 scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
|
|
+# helper scripts for service starting
|
|
|
+install -p -m 755 scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir
|
|
|
+install -p -m 755 scripts/mysql-check-socket %{buildroot}%{_libexecdir}/mysql-check-socket
|
|
|
+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
|
|
|
+%else
|
|
|
+# drop systemd files.
|
|
|
+rm -rf %{buildroot}%{_sysconfdir}/systemd
|
|
|
+%endif
|
|
|
+
|
|
|
install -m 0644 Docs/mysql.info %{buildroot}%{_infodir}
|
|
|
rm -rf ./doc
|
|
|
mv -f %{buildroot}%{_docdir} ./
|
|
|
rm doc/README-wsrep
|
|
|
|
|
|
+rm -rf ./groonga ./groonga-normalizer-mysql
|
|
|
mv -f %{buildroot}%{_datadir}/groonga ./
|
|
|
mv -f %{buildroot}%{_datadir}/groonga-normalizer-mysql ./
|
|
|
|
|
|
@@ -322,6 +381,10 @@ rm -f %{buildroot}%{_libdir}/mysql/plugin/daemon_example.ini
|
|
|
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
|
|
|
%else
|
|
|
rm -f %{buildroot}%{_mandir}/man1/tokuft*
|
|
|
%endif
|
|
|
@@ -340,13 +403,12 @@ perl -pi -e 's,-lmariadb,%{_libdir}/libmariadbclient.a,' %{buildroot}%{_datadir}
|
|
|
|
|
|
# install pam_user_map.so to /lib64/security for 64bit architectures
|
|
|
%ifarch x86_64
|
|
|
-mkdir -p %{buildroot}/%{_lib}/security
|
|
|
-mv %{buildroot}/lib/security/pam_user_map.so %{buildroot}/%{_lib}/security/
|
|
|
+if [ ! -e %{buildroot}/%{_lib}/security/pam_user_map.so ]; then
|
|
|
+ mkdir -p %{buildroot}/%{_lib}/security
|
|
|
+ mv %{buildroot}/lib/security/pam_user_map.so %{buildroot}/%{_lib}/security/
|
|
|
+fi
|
|
|
%endif
|
|
|
|
|
|
-# drop systemd files.
|
|
|
-rm -rf %{buildroot}%{_sysconfdir}/systemd
|
|
|
-
|
|
|
# drop client library
|
|
|
rm -f %{buildroot}%{_libdir}/libmariadb.so*
|
|
|
rm -f %{buildroot}%{_prefix}/lib/pkgconfig/libmariadb.pc
|
|
|
@@ -364,12 +426,16 @@ useradd -M -r -d $datadir -s /bin/bash -c "MySQL server" -g mysql mysql 2> /dev/
|
|
|
usermod -g mysql mysql 2> /dev/null || true
|
|
|
|
|
|
%post server
|
|
|
-
|
|
|
# Make MySQL start/shutdown automatically when the machine does it.
|
|
|
+
|
|
|
if [ $1 = 1 ] ; then
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_post %{daemon_name}.service
|
|
|
+%else
|
|
|
if [ -x /sbin/chkconfig ] ; then
|
|
|
/sbin/chkconfig --add mysql
|
|
|
fi
|
|
|
+%endif
|
|
|
|
|
|
basedir=`/usr/bin/my_print_defaults --mysqld|sed -ne 's/^--basedir=//p'|tail -1`
|
|
|
if [ -z "$basedir" ] ; then
|
|
|
@@ -418,6 +484,10 @@ if [ $1 = 1 ] ; then
|
|
|
fi
|
|
|
|
|
|
%preun server
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_preun %{daemon_name}.service
|
|
|
+%else
|
|
|
+%endif
|
|
|
if [ $1 = 0 ] ; then
|
|
|
# Stop MySQL before uninstalling it
|
|
|
if [ -x /etc/init.d/mysql ] ; then
|
|
|
@@ -430,6 +500,9 @@ if [ $1 = 0 ] ; then
|
|
|
fi
|
|
|
|
|
|
%postun server
|
|
|
+%if %{with systemd}
|
|
|
+%systemd_postun_with_restart %{daemon_name}.service
|
|
|
+%else
|
|
|
if [ $1 -ge 1 ]; then
|
|
|
if [ -x /etc/init.d/mysql ] ; then
|
|
|
# only restart the server if it was alredy running
|
|
|
@@ -437,6 +510,8 @@ if [ $1 -ge 1 ]; then
|
|
|
/etc/init.d/mysql restart
|
|
|
fi
|
|
|
fi
|
|
|
+%endif
|
|
|
+
|
|
|
|
|
|
%pre mroonga
|
|
|
if [ $1 -gt 1 ]; then
|
|
|
@@ -585,12 +660,22 @@ fi
|
|
|
%exclude %{_libdir}/mysql/plugin/ha_connect.so
|
|
|
%exclude %{_libdir}/mysql/plugin/ha_mroonga.so
|
|
|
%exclude %{_datadir}/mysql/mroonga
|
|
|
+%exclude %{_datadir}/mysql/systemd/use_galera_new_cluster.conf
|
|
|
%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}/security/user_map.conf
|
|
|
%config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
|
|
|
+%if %{with systemd}
|
|
|
+%{_bindir}/mariadb-service-convert
|
|
|
+%{_unitdir}/*.service
|
|
|
+%{_tmpfilesdir}/%{name}.conf
|
|
|
+%dir %{_unitdir}/mariadb.service.d
|
|
|
+%{_libexecdir}/*
|
|
|
+%{_sysusersdir}/%{name}.conf
|
|
|
+%else
|
|
|
%{_sysconfdir}/init.d/mysql
|
|
|
+%endif
|
|
|
%{_datadir}/mysql
|
|
|
%attr(755, mysql, mysql) %dir %{mysqldatadir}
|
|
|
%ifarch x86_64
|
|
|
@@ -621,6 +706,9 @@ fi
|
|
|
%config(noreplace) %{_sysconfdir}/my.cnf.d/galera.cnf
|
|
|
%{_bindir}/galera_new_cluster
|
|
|
%{_bindir}/galera_recovery
|
|
|
+%if %{with systemd}
|
|
|
+%{_datadir}/mysql/systemd/use_galera_new_cluster.conf
|
|
|
+%endif
|
|
|
|
|
|
%ifarch x86_64
|
|
|
%files tokudb
|
|
|
@@ -630,6 +718,9 @@ fi
|
|
|
%{_libdir}/mysql/plugin/ha_tokudb.so
|
|
|
%{_bindir}/tokuft*
|
|
|
%doc %{_mandir}/man1/tokuft*
|
|
|
+%if %{with systemd}
|
|
|
+%{_unitdir}/mariadb.service.d/tokudb.conf
|
|
|
+%endif
|
|
|
%endif
|
|
|
|
|
|
%files client
|
|
|
@@ -697,7 +788,7 @@ fi
|
|
|
%{_bindir}/mysql_config
|
|
|
%{_includedir}/mysql
|
|
|
%{_datadir}/aclocal/mysql.m4
|
|
|
-%{_datadir}/pkgconfig/mariadb.pc
|
|
|
+%{_libdir}/pkgconfig/mariadb.pc
|
|
|
%exclude %{_libdir}/pkgconfig/libmariadb.pc
|
|
|
%{_libdir}/*.so
|
|
|
%{_sysconfdir}/rpm/*
|
|
|
@@ -743,6 +834,11 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* 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.
|
|
|
+- added systemd support (disabled as default).
|
|
|
+
|
|
|
* Mon Feb 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.4.12-1
|
|
|
- new upstream release.
|
|
|
- replaced patch1000 to update Groonga to v9.1.2.
|
|
|
@@ -924,7 +1020,7 @@ fi
|
|
|
|
|
|
* Sat Sep 15 2012 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.5.27-1
|
|
|
- new upstream release.
|
|
|
-- added a sub-package 'MySQL-source".
|
|
|
+- added a sub-package "MySQL-source".
|
|
|
- added some macros for rpm.
|
|
|
|
|
|
* Thu Jun 21 2012 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.5.25-1
|
tomop