Author: glen Date: Fri Mar 9 14:16:24 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - rel 2; init now works
---- Files affected: SPECS: mysql.spec (1.366 -> 1.367) ---- Diffs: ================================================================ Index: SPECS/mysql.spec diff -u SPECS/mysql.spec:1.366 SPECS/mysql.spec:1.367 --- SPECS/mysql.spec:1.366 Thu Mar 1 20:27:46 2007 +++ SPECS/mysql.spec Fri Mar 9 15:16:19 2007 @@ -26,7 +26,7 @@ Summary(zh_CN.UTF-8): MySQL数据库服务器 Name: mysql Version: 5.1.16 -Release: 1 +Release: 2 License: GPL + MySQL FLOSS Exception Group: Applications/Databases #Source0: http://mysql.dataphone.se/Downloads/MySQL-5.1/%{name}-%{version}-beta.tar.gz @@ -44,8 +44,6 @@ Source11: %{name}-ndb-cpc.init Source12: %{name}-ndb-cpc.sysconfig Source13: %{name}-client.conf -Source14: %{name}-init_db.sql -Source15: %{name}-init_db-data.sql Patch0: %{name}-libs.patch Patch1: %{name}-libwrap.patch Patch2: %{name}-c++.patch @@ -59,6 +57,7 @@ Patch10: %{name}-alpha.patch Patch11: %{name}-upgrade.patch Patch12: %{name}-NDB_CXXFLAGS.patch +Patch13: %{name}-create_system_tables.patch Patch14: %{name}-bug-18156.patch Patch16: %{name}-bug-24747.patch URL: http://www.mysql.com/products/database/mysql/community_edition.html @@ -460,6 +459,7 @@ %patch9 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 %patch14 -p1 %patch16 -p1 @@ -558,8 +558,6 @@ awk 'BEGIN { RS="\n\n" } !/bdb/ { printf("%s\n\n", $0) }' < mysqld.tmp > mysqld.conf install mysqld.conf $RPM_BUILD_ROOT%{_datadir}/mysql/mysqld.conf -cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/mysql/init_db.sql -cp -a %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/mysql/init_db-data.sql cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/mysql/mysql-client.conf # NDB @@ -589,8 +587,18 @@ # http://dev.mysql.com/doc/refman/5.0/en/using-stack-trace.html %{?debug:nm -n $RPM_BUILD_ROOT%{_sbindir}/mysqld > $RPM_BUILD_ROOT%{_datadir}/mysql/mysqld.sym} +# do not clobber users $PATH +mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_create_system_tables +mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_upgrade +mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/innochecksum +mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisamchk +mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisamlog +mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/myisampack +mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysql_fix_privilege_tables +mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/my_print_defaults +mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck + # functionality in initscript / rpm -rm $RPM_BUILD_ROOT%{_bindir}/mysql_create_system_tables rm $RPM_BUILD_ROOT%{_bindir}/mysql_install_db rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql_install_db.1* rm $RPM_BUILD_ROOT%{_bindir}/mysqld_safe @@ -771,15 +779,16 @@ %attr(754,root,root) /etc/rc.d/init.d/mysql %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql %attr(640,root,mysql) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql/clusters.conf -%attr(755,root,root) %{_bindir}/innochecksum -%attr(755,root,root) %{_bindir}/myisamchk -%attr(755,root,root) %{_bindir}/myisamlog -%attr(755,root,root) %{_bindir}/myisampack -%attr(755,root,root) %{_bindir}/mysql_fix_privilege_tables -%attr(755,root,root) %{_bindir}/my_print_defaults -%attr(755,root,root) %{_bindir}/mysql_upgrade -%attr(755,root,root) %{_bindir}/mysqlcheck +%attr(755,root,root) %{_sbindir}/innochecksum +%attr(755,root,root) %{_sbindir}/myisamchk +%attr(755,root,root) %{_sbindir}/myisamlog +%attr(755,root,root) %{_sbindir}/myisampack +%attr(755,root,root) %{_sbindir}/my_print_defaults +%attr(755,root,root) %{_sbindir}/mysqlcheck +%attr(755,root,root) %{_sbindir}/mysql_create_system_tables %attr(755,root,root) %{_sbindir}/mysqld +%attr(755,root,root) %{_sbindir}/mysql_fix_privilege_tables +%attr(755,root,root) %{_sbindir}/mysql_upgrade %dir %{_libdir}/mysql %attr(755,root,root) %{_libdir}/mysql/ha_blackhole.so.*.*.* %attr(755,root,root) %{_libdir}/mysql/ha_example.so.*.*.* @@ -806,8 +815,6 @@ %{_datadir}/mysql/mysqld.conf %{_datadir}/mysql/english %{_datadir}/mysql/fill_help_tables.sql -%{_datadir}/mysql/init_db-data.sql -%{_datadir}/mysql/init_db.sql %{_datadir}/mysql/mysql_fix_privilege_tables.sql %lang(cs) %{_datadir}/mysql/czech %lang(da) %{_datadir}/mysql/danish @@ -969,6 +976,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.367 2007/03/09 14:16:19 glen +- rel 2; init now works + Revision 1.366 2007/03/01 19:27:46 glen - update to 5.1.16 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.366&r2=1.367&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
