SPECS: mysql.spec - fill_help_tables.sql moved to datadir and move...

[glen]

Author: glen                         Date: Wed Sep 13 10:51:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fill_help_tables.sql moved to datadir and moved to init; rel 4

---- Files affected:
SPECS:
   mysql.spec (1.342 -> 1.343) 

---- Diffs:

================================================================
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.342 SPECS/mysql.spec:1.343
--- SPECS/mysql.spec:1.342	Mon Sep 11 19:35:05 2006
+++ SPECS/mysql.spec	Wed Sep 13 12:51:14 2006
@@ -23,7 +23,7 @@
 Summary(zh_CN):	MySQLĘýžÝżâˇţÎńĆ÷
 Name:		mysql
 Version:	5.0.24a
-Release:	3
+Release:	4
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 Source0:	http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.0/%{name}-%{version}.tar.gz
@@ -591,7 +591,6 @@
 rm $RPM_BUILD_ROOT%{_bindir}/mysqld_safe
 rm $RPM_BUILD_ROOT%{_bindir}/mysqld_multi
 rm $RPM_BUILD_ROOT%{_mandir}/man1/mysqld_{multi,safe}*
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/fill_help_tables.sql
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql-log-rotate
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/mysql.server
 rm $RPM_BUILD_ROOT%{_datadir}/%{name}/binary-configure
@@ -614,15 +613,6 @@
 %post
 [ ! -x /usr/sbin/fix-info-dir ] || /usr/sbin/fix-info-dir -c %{_infodir} >/dev/null 2>&1
 /sbin/chkconfig --add mysql
-
-if [ "$1" = 1 ]; then
-	%banner -e %{name}-4.1.x <<-EOF
-	If you want to use new help tables in mysql 4.1.x then you'll need to import the help data:
-	zcat %{_docdir}/%{name}-%{version}/fill_help_tables.sql.gz | mysql mysql
-EOF
-#'
-fi
-
 %service mysql restart
 
 %preun
@@ -720,14 +710,14 @@
 done
 
 %banner -e %{name}-4.1.x <<-EOF
-	If you want to use new help tables in mysql 4.1.x then you'll need to import the help data:
-	zcat %{_docdir}/%{name}-%{version}/fill_help_tables.sql.gz | mysql mysql
+	If you want to use new help tables in MySQL 4.1.x then You'll need to import the help data:
+	mysql -u mysql mysql < %{_datadir}/%{name}/fill_help_tables.sql
 EOF
 #'
 
 %files
 %defattr(644,root,root,755)
-%doc support-files/*.cnf support-files/*.ini scripts/fill_help_tables.sql
+%doc support-files/*.cnf support-files/*.ini
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/mysql
 %attr(754,root,root) /etc/rc.d/init.d/mysql
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql
@@ -760,6 +750,7 @@
 # This is template for configuration file which is created after 'service mysql init'
 %{_datadir}/mysql/mysqld.conf
 %{_datadir}/mysql/english
+%{_datadir}/mysql/fill_help_tables.sql
 %{_datadir}/mysql/mysql_fix_privilege_tables.sql
 %lang(cs) %{_datadir}/mysql/czech
 %lang(da) %{_datadir}/mysql/danish
@@ -908,6 +899,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.343  2006/09/13 10:51:14  glen
+- fill_help_tables.sql moved to datadir and moved to init; rel 4
+
 Revision 1.342  2006/09/11 17:35:05  wiget
 - fix path to libs in mysql_config, release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.342&r2=1.343&f=u