- 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 3072aadf9db4611636d633b0e56ec0422b154a48..f1b3e48d4840d9773902f955a08055b7748b93c2 100644 (file)
--- 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 c4facd68e129a603c051c7ad5314b47ab2e9fddb..35edabc1300be9fc047db264c71e0c041c8fb080 100644 (file)
--- 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}