rpms/mariadb
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Include mysqld_unit only if required; enable tokudb in f20-

Browse Source
This commit is contained in:
Honza Horak 2014-08-14 15:14:58 +02:00
parent c5f6daa7dc
commit 2390bfeb42
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mariadb.spec
View File

@ -19,8 +19,8 @@
# TokuDB engine is now part of MariaDB, but it is available only for x86_64; # TokuDB engine is now part of MariaDB, but it is available only for x86_64;
# variable tokudb allows to build with TokuDB storage engine # variable tokudb allows to build with TokuDB storage engine
# Temporarily disabled for https://mariadb.atlassian.net/browse/MDEV-6446 # Temporarily disabled in F21+ for https://mariadb.atlassian.net/browse/MDEV-6446
%ifarch 0 #x86_64 %ifarch 0%{?fedora} < 21 #x86_64
%bcond_without tokudb %bcond_without tokudb
%else %else
%bcond_with tokudb %bcond_with tokudb
@ -104,7 +104,7 @@
Name: %{pkgname} Name: %{pkgname}
Version: %{compatver}.%{bugfixver} Version: %{compatver}.%{bugfixver}
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 1 Epoch: 1
Summary: A community developed branch of MySQL Summary: A community developed branch of MySQL
@ -248,7 +248,7 @@ package itself.
%endif %endif
%%if %{with common} %if %{with common}
%package common %package common
Summary: The shared files required by server and client Summary: The shared files required by server and client
Group: Applications/Databases Group: Applications/Databases
@ -625,7 +625,7 @@ ln -s %{logfile} %{buildroot}%{old_logfile}
# current setting in my.cnf is to use /var/run/mariadb for creating pid file, # current setting in my.cnf is to use /var/run/mariadb for creating pid file,
# however since my.cnf is not updated by RPM if changed, we need to create mysqld # however since my.cnf is not updated by RPM if changed, we need to create mysqld
# as well because users can have odd settings in their /etc/my.cnf # as well because users can have odd settings in their /etc/my.cnf
mkdir -p %{buildroot}%{_localstatedir}/run/%{mysqld_unit} %{?mysqld_unit:mkdir -p %{buildroot}%{_localstatedir}/run/%{mysqld_unit}}
mkdir -p %{buildroot}%{_localstatedir}/run/%{daemon_name} mkdir -p %{buildroot}%{_localstatedir}/run/%{daemon_name}
install -p -m 0755 -d %{buildroot}%{_localstatedir}/lib/mysql install -p -m 0755 -d %{buildroot}%{_localstatedir}/lib/mysql
@ -1067,7 +1067,7 @@ fi
%{_libexecdir}/mysql-scripts-common %{_libexecdir}/mysql-scripts-common
%{?with_init_systemd:%{_tmpfilesdir}/%{name}.conf} %{?with_init_systemd:%{_tmpfilesdir}/%{name}.conf}
%attr(0755,mysql,mysql) %dir %{_localstatedir}/run/%{mysqld_unit} %{?mysqld_unit:%attr(0755,mysql,mysql) %dir %{_localstatedir}/run/%{mysqld_unit}}
%attr(0755,mysql,mysql) %dir %{_localstatedir}/run/%{daemon_name} %attr(0755,mysql,mysql) %dir %{_localstatedir}/run/%{daemon_name}
%attr(0755,mysql,mysql) %dir %{_localstatedir}/lib/mysql %attr(0755,mysql,mysql) %dir %{_localstatedir}/lib/mysql
%attr(0750,mysql,mysql) %dir %{logfiledir} %attr(0750,mysql,mysql) %dir %{logfiledir}
@ -1120,6 +1120,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Aug 14 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.13-2
- Include mysqld_unit only if required; enable tokudb in f20-
* Wed Aug 13 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.13-1 * Wed Aug 13 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.13-1
- Rebase to version 10.0.13 - Rebase to version 10.0.13