瀏覽代碼

workaround expansion problems under IRIX (and potentially also other Unix flavors) by not passing arbitrary complex substitutions to GNU shtool, because this leads to escaping problems

Ralf S. Engelschall 18 年之前
父節點
當前提交
f5756d3f3d
共有 3 個文件被更改,包括 18 次插入15 次删除
  1. 6 5
      mysql/mysql.spec
  2. 6 5
      mysql51/mysql51.spec
  3. 6 5
      mysql6/mysql6.spec

+ 6 - 5
mysql/mysql.spec

@@ -40,7 +40,7 @@ Class:        BASE
 Group:        Database
 License:      GPL
 Version:      %{V_opkg}
-Release:      20070912
+Release:      20071005
 
 #   package options
 %option       with_server      yes
@@ -239,18 +239,19 @@ AutoReqProv:  no
 
     #   install global configuration
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/mysql
-    %{l_shtool} install%{l_nil} -c -m 644 %{l_value -s -a} \
+    sed <%{SOURCE my.cnf} >my.cnf \
 %if "%{with_bdb}" == "yes"
         -e '/<\/\{0,1\}with_bdb>/d' \
 %else
         -e '/<with_bdb>/,/<\/with_bdb>/d' \
 %endif
 %if "%{with_innobase}" == "yes"
-        -e '/<\/\{0,1\}with_innobase>/d' \
+        -e '/<\/\{0,1\}with_innobase>/d'
 %else
-        -e '/<with_innobase>/,/<\/with_innobase>/d' \
+        -e '/<with_innobase>/,/<\/with_innobase>/d'
 %endif
-        %{SOURCE my.cnf} \
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        my.cnf \
         $RPM_BUILD_ROOT%{l_prefix}/etc/mysql/
     %{l_shtool} install -c -m 600 \
         %{SOURCE my.pwd} \

+ 6 - 5
mysql51/mysql51.spec

@@ -39,7 +39,7 @@ Class:        EVAL
 Group:        Database
 License:      GPL
 Version:      %{V_opkg}
-Release:      20071001
+Release:      20071005
 
 #   package options
 %option       with_server      yes
@@ -219,13 +219,14 @@ Provides:     mysql = %{version}-%{release}
 
     #   install global configuration
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/mysql
-    %{l_shtool} install%{l_nil} -c -m 644 %{l_value -s -a} \
+    sed <%{SOURCE my.cnf} >my.cnf \
 %if "%{with_innobase}" == "yes"
-        -e '/<\/\{0,1\}with_innobase>/d' \
+        -e '/<\/\{0,1\}with_innobase>/d'
 %else
-        -e '/<with_innobase>/,/<\/with_innobase>/d' \
+        -e '/<with_innobase>/,/<\/with_innobase>/d'
 %endif
-        %{SOURCE my.cnf} \
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        my.cnf \
         $RPM_BUILD_ROOT%{l_prefix}/etc/mysql/
     %{l_shtool} install -c -m 600 \
         %{SOURCE my.pwd} \

+ 6 - 5
mysql6/mysql6.spec

@@ -39,7 +39,7 @@ Class:        EVAL
 Group:        Database
 License:      GPL
 Version:      %{V_opkg}
-Release:      20070905
+Release:      20071005
 
 #   package options
 %option       with_server      yes
@@ -225,13 +225,14 @@ Provides:     mysql = %{version}-%{release}
 
     #   install global configuration
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/mysql
-    %{l_shtool} install%{l_nil} -c -m 644 %{l_value -s -a} \
+    sed <%{SOURCE my.cnf} >my.cnf \
 %if "%{with_innobase}" == "yes"
-        -e '/<\/\{0,1\}with_innobase>/d' \
+        -e '/<\/\{0,1\}with_innobase>/d'
 %else
-        -e '/<with_innobase>/,/<\/with_innobase>/d' \
+        -e '/<with_innobase>/,/<\/with_innobase>/d'
 %endif
-        %{SOURCE my.cnf} \
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        my.cnf \
         $RPM_BUILD_ROOT%{l_prefix}/etc/mysql/
     %{l_shtool} install -c -m 600 \
         %{SOURCE my.pwd} \