diff --git a/mariadb.spec b/mariadb.spec index d01ff61..3df2143 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -5,7 +5,7 @@ %define userid 65018 Name: mariadb -Version: 5.5.45 +Version: 10.1.18 Release: 1mamba Summary: A SQL database engine designed as a drop-in replacement of MySQL(R) Group: Applications/Databases @@ -187,7 +187,7 @@ install -d %{buildroot}/var/lib/mysql%{?MAJversion} install -D -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/mariadb.service install -D -m0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/mariadb.conf -#install -D -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/logrotate.d/mariadb +install -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/mariadb #install -D -m755 %{SOURCE3} \ # %{buildroot}%{_datadir}/mysql/%{name}_convert_db_format_to_mysql41 # copy default configuration file @@ -202,16 +202,16 @@ install -D -m644 support-files/rpm/mysql-clients.cnf %{buildroot}%{_sysconfdir}/ mv %{buildroot}%{_prefix}/lib/lib* %{buildroot}%{_libdir}/ %endif -#install -d -m0755 %{buildroot}%{_sysconfdir}/php/php.d -#cat > %{buildroot}%{_sysconfdir}/php/php.d/mysql_mariadb.ini << _EOF -#[MySQL] -#mysql.default_socket = /run/mysqld/mysql.sock -#_EOF +install -d -m0755 %{buildroot}%{_sysconfdir}/php/php.d +cat > %{buildroot}%{_sysconfdir}/php/php.d/mysql_mariadb.ini << _EOF +[MySQL] +mysql.default_socket = /run/mysqld/mysql.sock +_EOF -#cat > %{buildroot}%{_sysconfdir}/php/php.d/mysqli_mariadb.ini << _EOF -#[MySQLi] -#mysqli.default_socket = /run/mysqld/mysql.sock -#_EOF +cat > %{buildroot}%{_sysconfdir}/php/php.d/mysqli_mariadb.ini << _EOF +[MySQLi] +mysqli.default_socket = /run/mysqld/mysql.sock +_EOF # delete unpackaged files @@ -264,7 +264,7 @@ if [ $1 -ge 1 ]; then systemctl -q enable mariadb systemctl -q start mariadb } - mysql_upgrade --silent || { + mysql_upgrade || { echo "Run: 'mysql_upgrade -u root -p' to upgrade db!" } fi @@ -306,6 +306,7 @@ fi %{_bindir}/mysqld %{_bindir}/mysql_embedded %{_bindir}/mysql_upgrade +#%{_bindir}/maria_add_gis_sp.sql %{_mandir}/man1/mysql_upgrade.1* %{_mandir}/man8/mysqld.8* %doc COPYING README @@ -314,6 +315,8 @@ fi %files server %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/my.cnf.d/server.cnf +%{_sysconfdir}/php/php.d/mysql_mariadb.ini +%{_sysconfdir}/php/php.d/mysqli_mariadb.ini %{_unitdir}/mariadb.service %{_tmpfilesdir}/mariadb.conf %attr(755,mysql,mysql) %dir /var/lib/mysql%{?MAJversion} @@ -348,7 +351,6 @@ fi %{_bindir}/mytop %ifarch x86_64 %{_bindir}/tokuftdump -%{_bindir}/tokuft_logprint %endif %{_mandir}/man1/msql2mysql.1* %{_mandir}/man1/mysql.1* @@ -372,8 +374,11 @@ fi %files common %defattr(-,root,root) %config %{_sysconfdir}/my.cnf -#%config(noreplace) %{_sysconfdir}/logrotate.d/mariadb +%config(noreplace) %{_sysconfdir}/logrotate.d/mariadb +%{_bindir}/galera_new_cluster +%{_bindir}/galera_recovery %{_bindir}/innochecksum +%{_bindir}/mariadb-service-convert %{_bindir}/my_print_defaults %{_bindir}/myisamchk %{_bindir}/myisamlog @@ -402,6 +407,10 @@ fi %{_bindir}/replace %{_bindir}/resolve_stack_dump %{_bindir}/resolveip +%ifarch x86_64 +%{_bindir}/tokuft_logprint +%endif +%{_bindir}/wsrep_sst_* #%{_sbindir}/mysqlmanager %dir %{_datadir}/mysql%{?MAJversion} #%{_datadir}/mysql/%{name}_convert_db_format_to_mysql41 @@ -430,24 +439,32 @@ fi %lang(uk) %{_datadir}/mysql%{?MAJversion}/ukrainian %{_datadir}/mysql%{?MAJversion}/charsets %{_datadir}/mysql%{?MAJversion}/errmsg-utf8.txt -%{_datadir}/mysql%{?MAJversion}/fill_help_tables.sql -#%{_datadir}/mysql%{?MAJversion}/mysql_fix_privilege_tables.sql -%{_datadir}/mysql%{?MAJversion}/mysql_system_tables.sql -%{_datadir}/mysql%{?MAJversion}/mysql_system_tables_data.sql -%{_datadir}/mysql%{?MAJversion}/mysql_test_data_timezone.sql +%{_datadir}/mysql%{?MAJversion}/*.sql %{_datadir}/mysql%{?MAJversion}/mysql.server %{_datadir}/mysql%{?MAJversion}/mysqld_multi.server %{_datadir}/mysql%{?MAJversion}/magic - +%{_datadir}/mysql/*.sql +%{_datadir}/mysql/README-wsrep +%{_datadir}/mysql/CREDITS %{_datadir}/mysql/COPYING %{_datadir}/mysql/COPYING.LESSER +%{_datadir}/mysql/COPYING.thirdparty %{_datadir}/mysql/EXCEPTIONS-CLIENT %{_datadir}/mysql/INSTALL-BINARY %{_datadir}/mysql/README -%{_datadir}/mysql/SELinux/RHEL4/mysql.fc -%{_datadir}/mysql/SELinux/RHEL4/mysql.te +#%{_datadir}/mysql/SELinux/RHEL4/mysql.fc +#%{_datadir}/mysql/SELinux/RHEL4/mysql.te %dir %{_datadir}/mysql/aclocal %{_datadir}/mysql/aclocal/mysql.m4 +%dir %{_datadir}/mysql/mroonga +%{_datadir}/mysql/mroonga/*.sql +%dir %{_datadir}/mysql/policy +%{_datadir}/mysql/policy/* +%dir %{_datadir}/mysql/pkgconfig +%{_datadir}/mysql/pkgconfig/mariadb.pc +%dir %{_datadir}/mysql/systemd +%{_datadir}/mysql/systemd/* +%{_datadir}/mysql/wsrep_notify %ifarch x86_64 %dir %{_datadir}/mysql/docs %{_datadir}/mysql/docs/* @@ -499,6 +516,7 @@ fi %{_libdir}/libmysqld.so.* %{_libdir}/libmysqlclient.so.* %{_libdir}/libmysqlclient_r.so.* +%{_libdir}/mysql/plugin/JdbcInterface.jar #%{_libdir}/libmysqlservices.so %{_libdir}/mysql%{?MAJversion}/plugin/*.so %{_libdir}/mysql/plugin/daemon_example.ini @@ -522,20 +540,50 @@ fi %{_mandir}/man1/mysql_config.1* %changelog -* Sun Oct 11 2015 Silvan Calarco 5.5.45-1mamba -- update to 5.5.45 -- remove incorrect installed logrotate file +* Sat Oct 01 2016 Automatic Build System 10.1.18-1mamba +- automatic version update by autodist -* Thu Jul 02 2015 Silvan Calarco 5.5.44-1mamba -- update to 5.5.44 +* Thu Sep 15 2016 Automatic Build System 10.1.17-1mamba +- automatic version update by autodist -* Fri May 15 2015 Silvan Calarco 5.5.43-1mamba -- update to 5.5.43 -- remove php config file after changing default socket path in php +* Fri Jul 22 2016 Automatic Build System 10.1.16-1mamba +- automatic version update by autodist -* Tue Apr 14 2015 Silvan Calarco 5.5.42-3mamba -- create user and group in posttrans to prevent removal from obsoleted mysql -- provide and obsolete libmysql5-devel +* Mon May 16 2016 Automatic Build System 10.1.14-1mamba +- automatic version update by autodist + +* Wed Apr 27 2016 Automatic Build System 10.1.13-2mamba +- automatic version update by autodist + +* Sat Mar 26 2016 Automatic Build System 10.1.13-1mamba +- automatic version update by autodist + +* Mon Feb 29 2016 Automatic Build System 10.1.12-1mamba +- automatic version update by autodist + +* Thu Feb 04 2016 Automatic Build System 10.1.11-1mamba +- automatic version update by autodist + +* Fri Dec 25 2015 Automatic Build System 10.1.10-1mamba +- automatic version update by autodist + +* Wed Oct 28 2015 Automatic Build System 10.1.8-1mamba +- automatic version update by autodist + +* Fri Aug 07 2015 Automatic Build System 10.0.21-1mamba +- automatic version update by autodist + +* Fri Jun 19 2015 Automatic Build System 10.0.20-1mamba +- automatic version update by autodist + +* Sat May 09 2015 Automatic Build System 10.0.19-1mamba +- automatic version update by autodist + +* Fri May 08 2015 Automatic Build System 10.0.18-1mamba +- automatic version update by autodist + +* Sun Apr 05 2015 Automatic Build System 10.0.17-1mamba +- automatic version update by autodist * Sat Mar 28 2015 Silvan Calarco 5.5.42-2mamba - rename /run/mysqld/mysqld.sock to /run/mysql/mysql.sock