packages: mysql/mysql.spec - fix mysql_install_db

[arekm]

Author: arekm                        Date: Sat Jul 31 09:23:23 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix mysql_install_db

---- Files affected:
packages/mysql:
   mysql.spec (1.489 -> 1.490) 

---- Diffs:

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.489 packages/mysql/mysql.spec:1.490
--- packages/mysql/mysql.spec:1.489	Sun Jul 25 02:59:10 2010
+++ packages/mysql/mysql.spec	Sat Jul 31 11:23:18 2010
@@ -33,7 +33,7 @@
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
 Version:	5.1.49
-Release:	1
+Release:	2
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 #Source0Download: http://dev.mysql.com/downloads/mysql/5.1.html#source
@@ -671,11 +671,13 @@
 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
+sed -i -e 's#/usr/bin/my_print_defaults#%{_sbindir}/my_print_defaults#g' $RPM_BUILD_ROOT%{_bindir}/mysql_install_db
 mv $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/mysqlcheck
 
-# functionality in initscript / rpm
-rm $RPM_BUILD_ROOT%{_bindir}/mysql_install_db
-rm $RPM_BUILD_ROOT%{_mandir}/man1/mysql_install_db.1*
+# delete - functionality in initscript / rpm
+# mysql_install_db is needed by digikam
+#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
 rm $RPM_BUILD_ROOT%{_bindir}/mysqld_multi
 rm $RPM_BUILD_ROOT%{_mandir}/man1/mysqld_{multi,safe}*
@@ -872,6 +874,7 @@
 %attr(755,root,root) %{_sbindir}/mysql_upgrade
 %attr(755,root,root) %{_sbindir}/mysqlcheck
 %attr(755,root,root) %{_sbindir}/mysqld
+%attr(755,root,root) %{_bindir}/mysql_install_db
 %dir %{_libdir}/mysql
 %dir %{_libdir}/mysql/plugin
 %attr(755,root,root) %{_libdir}/mysql/plugin/ha_innodb_plugin.so
@@ -884,6 +887,7 @@
 %{_mandir}/man1/myisamlog.1*
 %{_mandir}/man1/myisampack.1*
 %{_mandir}/man1/mysql_fix_privilege_tables.1*
+%{_mandir}/man1/mysql_install_db.1*
 %{_mandir}/man1/mysql_upgrade.1*
 %{_mandir}/man1/mysqlcheck.1*
 %{_mandir}/man8/mysqld.8*
@@ -1123,6 +1127,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.490  2010/07/31 09:23:18  arekm
+- fix mysql_install_db
+
 Revision 1.489  2010/07/25 00:59:10  glen
 - sphinx builds; enable
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.489&r2=1.490&f=u