OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 05-Oct-2007 17:32:22
Branch: HEAD Handle: 2007100516322001
Modified files:
openpkg-src/mysql mysql.spec
openpkg-src/mysql51 mysql51.spec
openpkg-src/mysql6 mysql6.spec
Log:
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
Summary:
Revision Changes Path
1.171 +6 -5 openpkg-src/mysql/mysql.spec
1.24 +6 -5 openpkg-src/mysql51/mysql51.spec
1.3 +6 -5 openpkg-src/mysql6/mysql6.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mysql/mysql.spec
============================================================================
$ cvs diff -u -r1.170 -r1.171 mysql.spec
--- openpkg-src/mysql/mysql.spec 12 Sep 2007 19:39:45 -0000 1.170
+++ openpkg-src/mysql/mysql.spec 5 Oct 2007 15:32:20 -0000 1.171
@@ -40,7 +40,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20070912
+Release: 20071005
# package options
%option with_server yes
@@ -239,18 +239,19 @@
# 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} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql51/mysql51.spec
============================================================================
$ cvs diff -u -r1.23 -r1.24 mysql51.spec
--- openpkg-src/mysql51/mysql51.spec 1 Oct 2007 06:07:56 -0000 1.23
+++ openpkg-src/mysql51/mysql51.spec 5 Oct 2007 15:32:21 -0000 1.24
@@ -39,7 +39,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20071001
+Release: 20071005
# package options
%option with_server yes
@@ -219,13 +219,14 @@
# 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} \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mysql6/mysql6.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 mysql6.spec
--- openpkg-src/mysql6/mysql6.spec 5 Sep 2007 07:26:10 -0000 1.2
+++ openpkg-src/mysql6/mysql6.spec 5 Oct 2007 15:32:21 -0000 1.3
@@ -39,7 +39,7 @@
Group: Database
License: GPL
Version: %{V_opkg}
-Release: 20070905
+Release: 20071005
# package options
%option with_server yes
@@ -225,13 +225,14 @@
# 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} \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
