From: Artur Frysiak <artur@frysiak.net>
Date: Mon, 13 Dec 2010 15:09:11 +0000 (+0000)
Subject: - allow spaces and tabs after variable name
X-Git-Tag: auto/th/mysql-5_1_52-3
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=583cdd10b088342e18c4af8946b25ab38d2378e0;p=packages%2Fmysql.git

- allow spaces and tabs after variable name
- drop versioned mawk R:
- release 3

Changed files:
    mysql.init -> 1.144
    mysql.spec -> 1.496
---

diff --git a/mysql.init b/mysql.init
index 3072aad..f1b3e48 100644
--- a/mysql.init
+++ b/mysql.init
@@ -210,21 +210,21 @@ mysqlgetconfig() {
 	}
 
 	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);
 		}
 	}
diff --git a/mysql.spec b/mysql.spec
index c4facd6..35edabc 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -32,7 +32,7 @@ Summary(uk.UTF-8):	MySQL - швидкий SQL-сервер
 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
@@ -105,7 +105,6 @@ Requires(triggerpostun):	sed >= 4.0
 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}