packages: mysql/mysql.init, mysql/mysql.spec - allow spaces and tabs after ...

[wiget]

Author: wiget                        Date: Mon Dec 13 15:09:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- allow spaces and tabs after variable name
- drop versioned mawk R:
- release 3

---- Files affected:
packages/mysql:
   mysql.init (1.143 -> 1.144) , mysql.spec (1.495 -> 1.496) 

---- Diffs:

================================================================
Index: packages/mysql/mysql.init
diff -u packages/mysql/mysql.init:1.143 packages/mysql/mysql.init:1.144
--- packages/mysql/mysql.init:1.143	Wed Apr 21 10:51:17 2010
+++ packages/mysql/mysql.init	Mon Dec 13 16:09:11 2010
@@ -210,21 +210,21 @@
 	}
 
 	section == "mysqld" {
-		if ($1 == "datadir") {
+		if ($1 ~ /^datadir[ \t]*$/) {
 			printf("MYSQL_DATA_DIR=%s;", $2);
-		} else if ($1 == "user") {
+		} else if ($1 ~ /^user[ \t]*$/) {
 			printf("MYSQL_USER=%s;", $2);
-		} else if ($1 == "pid-file") {
+		} else if ($1 ~ /^pid-file[ \t]*$/) {
 			printf("MYSQL_PIDFILE=%s;", $2);
-		} else if ($1 == "socket") {
+		} else if ($1 ~ /^socket[ \t]*$/) {
 			printf("MYSQL_SOCKET=%s;", $2);
-		} else if ($1 == "port") {
+		} else if ($1 ~ /^port[ \t]*$/) {
 			printf("MYSQL_PORT=%s;", $2);
-		} else if ($1 == "bind-address") {
+		} else if ($1 ~ /^bind-address[ \t]*$/) {
 			printf("MYSQL_BIND_ADDRESS=%s;", $2);
-		} else if ($1 == "skip-networking") {
+		} else if ($1 ~ /^skip-networking[ \t]*$/) {
 			printf("MYSQL_SKIP_NETWORKING=1;");
-		} else if ($1 == "log-error") {
+		} else if ($1 ~ /^log-error[ \t]*$/) {
 			printf("MYSQL_LOG_ERROR=%s;", $2);
 		}
 	}

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.495 packages/mysql/mysql.spec:1.496
--- packages/mysql/mysql.spec:1.495	Sat Dec 11 12:22:32 2010
+++ packages/mysql/mysql.spec	Mon Dec 13 16:09:11 2010
@@ -33,7 +33,7 @@
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
 Version:	5.1.52
-Release:	2
+Release:	3
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 #Source0Download: http://dev.mysql.com/downloads/mysql/5.1.html#source
@@ -106,7 +106,6 @@
 Requires:	%{name}-charsets = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	/usr/bin/setsid
-Requires:	mawk <= 1.3.3
 Requires:	rc-scripts >= 0.2.0
 Suggests:	mysql-client
 %{?with_tcpd:Suggests:	tcp_wrappers}
@@ -1124,6 +1123,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.496  2010/12/13 15:09:11  wiget
+- allow spaces and tabs after variable name
+- drop versioned mawk R:
+- release 3
+
 Revision 1.495  2010/12/11 11:22:32  uzsolt
 - requires versioned mawk (see http://www.opensubscriber.com/message/pld-devel-en@lists.pld-linux.org/14830609.html )
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.init?r1=1.143&r2=1.144&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.495&r2=1.496&f=u