Commit 2fc334c1 authored by tim@work.mysql.com's avatar tim@work.mysql.com

Merge work.mysql.com:/home/bk/mysql-4.0

into work.mysql.com:/home/tim/my/4
parents 2eb83ad4 a98a87af
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
function copy_to_bmachine function copy_to_bmachine
{ {
if [ x$local_build = x1 ]; then if [ x$local_build = x1 ]; then
rm -f $2
cp $1 $2 cp $1 $2
else else
scp $1 $owner@$bmachine:$2 scp $1 $owner@$bmachine:$2
...@@ -14,6 +15,7 @@ function copy_to_bmachine ...@@ -14,6 +15,7 @@ function copy_to_bmachine
function copy_from_bmachine function copy_from_bmachine
{ {
if [ x$local_build = x1 ]; then if [ x$local_build = x1 ]; then
rm -f $2
cp $1 $2 cp $1 $2
else else
scp $owner@$bmachine:$1 $2 scp $owner@$bmachine:$1 $2
...@@ -105,10 +107,11 @@ if [ ! -f "$tarball" ]; then ...@@ -105,10 +107,11 @@ if [ ! -f "$tarball" ]; then
exit 1 exit 1
fi fi
echo "Building RPM for MySQL version $VER on $bmachine"
log=$logdir/Log-RPM-`date +%y%m%d-%H%M` log=$logdir/Log-RPM-`date +%y%m%d-%H%M`
echo "Building RPM for MySQL version $VER on $bmachine"
echo "Details in $log"
( (
set -x set -x
# Copy MySQL source and spec files # Copy MySQL source and spec files
......
...@@ -148,7 +148,7 @@ Summary(pt_BR): MySQL - Medi ...@@ -148,7 +148,7 @@ Summary(pt_BR): MySQL - Medi
Group(pt_BR): Aplicaes/Banco_de_Dados Group(pt_BR): Aplicaes/Banco_de_Dados
Obsoletes: embedded Obsoletes: embedded
%description devel %description embedded
This package contains the MySQL server as library. This package contains the MySQL server as library.
%{see_base} %{see_base}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment