fix default settings, now hardcodes @l_prefix@/etc/mysql instead of /etc

mysql/my.cnf

@@ -1,9 +1,11 @@
+[client]
+socket       = @l_prefix@/var/mysql/mysql.sock
+port         = 3306
 
 [safe_mysqld]
-datadir      = @l_prefix@/var/mysql/db
-socket       = @l_prefix@/var/mysql/mysqld.sock
+datadir      = @l_prefix@/var/mysql
+socket       = @l_prefix@/var/mysql/mysql.sock
 set-variable = pid_file=@l_prefix@/var/mysql/mysqld.pid
-set-variable = max_connections=1000
 port         = 3306
 user         = @l_rusr@
 basedir      = @l_prefix@

mysql/mysql-defaults.patch

@@ -0,0 +1,11 @@
+--- mysys/default.c.dist	Fri Jan 10 11:42:15 2003
++++ mysys/default.c	Fri Jan 10 11:42:31 2003
+@@ -48,7 +48,7 @@
+ #ifdef __WIN__
+ "C:/",
+ #else
+-"/etc/",
++"@l_prefix@/etc/mysql/",
+ #endif
+ #ifdef DATADIR
+ DATADIR,

mysql/mysql.spec

@@ -37,7 +37,7 @@ Distribution: OpenPKG [BASE]
 Group:        Database
 License:      GPL
 Version:      %{V_major}.%{V_minor}
-Release:      20030109
+Release:      20030110
 
 #   package options
 %option       with_berkeleydb  yes
@@ -66,6 +66,7 @@ Source1:      my.cnf
 Source2:      my.pwd
 Source3:      rc.mysql
 Patch0:       mysql.patch
+Patch1:       mysql-defaults.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -85,15 +86,20 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %patch -p0
+    %patch0 -p0
+    %patch1 -p0
 
 %build
+    #   patch file search path
+    %{l_shtool} subst \
+        -e 's;@l_prefix@;%{l_prefix};g' \
+        mysys/default.c
+
     #   determine additional configure options
     case "%{l_target}" in
         *-freebsd* ) opt="--with-client-ldflags=-static --with-mysqld-ldflags=-static" ;;
         *-linux*   ) opt="--with-client-ldflags=-static --with-mysqld-ldflags=-static" ;;
         *-solaris* ) opt="--with-client-ldflags=-static --with-mysqld-ldflags=-static" ;;
-        #*-solaris* ) opt="" ;; # static compiling doesn't work under Solaris because of missing libdl.a
     esac
 
     #   configure source tree

mysql/rc.mysql

@@ -24,14 +24,12 @@
     cd @l_prefix@
     @l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
         --mysqld=@mysqld@ \
-        --defaults-file=${mysql_cnf_file} \
         --pid-file="$mysql_pid_file" \
         --err-log="$mysql_log_err" &
 
 %stop -p 200 -u @l_rusr@
     opServiceEnabled mysql || exit 0
     @l_prefix@/bin/mysqladmin \
-        --defaults-file=${mysql_cnf_file} \
         --defaults-extra-file=${mysql_pwd_file} \
         shutdown
 
@@ -39,7 +37,6 @@
     opServiceEnabled mysql || exit 0
     cd @l_prefix@
     @l_prefix@/bin/mysqladmin \
-        --defaults-file=${mysql_cnf_file} \
         --defaults-extra-file=${mysql_pwd_file} \
         shutdown
     @l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
@@ -54,7 +51,6 @@
         -z${mysql_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
         -P "${mysql_log_prolog}" \
         -E "@l_prefix@/bin/mysqladmin \
-            --defaults-file=${mysql_cnf_file} \
             --defaults-extra-file=${mysql_pwd_file} \
             flush-logs ; ${mysql_log_epilog}" \
         ${mysql_log_common} \