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

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

into work.mysql.com:/home/tim/my/4
parents 2eb83ad4 a98a87af

Build-tools/Do-rpm

+5 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
function copy_to_bmachine

{

 if [ x$local_build = x1 ]; then

  rm -f $2

  cp $1 $2

 else

  scp $1 $owner@$bmachine:$2
@@ -14,6 +15,7 @@ function copy_to_bmachine 
function copy_from_bmachine

{

 if [ x$local_build = x1 ]; then

  rm -f $2

  cp $1 $2

 else

  scp $owner@$bmachine:$1 $2
@@ -105,10 +107,11 @@ if [ ! -f "$tarball" ]; then 
 exit 1

fi



echo "Building RPM for MySQL version $VER on $bmachine"



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

# Copy MySQL source and spec files

support-files/mysql.spec.sh

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ Summary(pt_BR): MySQL - Medi 
Group(pt_BR): Aplicaes/Banco_de_Dados

Obsoletes: embedded



%description devel

%description embedded

This package contains the MySQL server as library.



%{see_base}