summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@work.mysql.com>2000-12-31 11:50:54 +0100
committerunknown <monty@work.mysql.com>2000-12-31 11:50:54 +0100
commitff4e47501a5cd0d95fc4e2c2f5a8ee34b8400430 (patch)
treebb2dcc8e889cd803ed01b92b03e1773d039ae086
parent067d27697bd9ea50a496f9481c2c8fbb0c044f2c (diff)
downloadmariadb-git-ff4e47501a5cd0d95fc4e2c2f5a8ee34b8400430.tar.gz
Install mysqltest binary and new man pages
Build-tools/Do-rpm: Remove old packages before compiling
-rwxr-xr-xBuild-tools/Do-rpm4
-rw-r--r--support-files/mysql.spec.sh18
2 files changed, 20 insertions, 2 deletions
diff --git a/Build-tools/Do-rpm b/Build-tools/Do-rpm
index e480a6f8344..51c0d6a152e 100755
--- a/Build-tools/Do-rpm
+++ b/Build-tools/Do-rpm
@@ -25,6 +25,10 @@ VER=`grep "AM_INIT_AUTOMAKE(mysql, " $bpath/configure.in | \
sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;'`
VER_NO_DASH=`echo $VER | sed -e "s|-.*$||"`
+echo "Removing old MySQL packages"
+rm -rf $rpmdir/BUILD/mysql-*
+rm -f $rpmdir/SRPMS/MySQL-*
+
echo "Building RPM for MySQL version $VER on $bmachine"
log=$bpath/Logs/Log-RPM-`date +%y%m%d-%H%M`
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index bbf458a8adc..2d1107dddbc 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -140,9 +140,9 @@ BuildMySQL() {
# support assembler speedups.
sh -c "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \
CC=\"${MYSQL_BUILD_CC:-egcs}\" \
- CFLAGS=\"${MYSQL_BUILD_CFLAGS:- -O6 -fomit-frame-pointer}\" \
+ CFLAGS=\"${MYSQL_BUILD_CFLAGS:- -O6}\" \
CXX=\"${MYSQL_BUILD_CXX:-egcs}\" \
- CXXFLAGS=\"${MYSQL_BUILD_CXXFLAGS:- -O6 -fomit-frame-pointer \
+ CXXFLAGS=\"${MYSQL_BUILD_CXXFLAGS:- -O6 \
-felide-constructors -fno-exceptions -fno-rtti}\" \
./configure \
$* \
@@ -305,6 +305,7 @@ fi
%attr(755, root, root) /usr/bin/mysql_setpermission
%attr(755, root, root) /usr/bin/mysql_zap
%attr(755, root, root) /usr/bin/mysqlbug
+%attr(755, root, root) /usr/bin/mysqltest
%attr(755, root, root) /usr/bin/mysqlhotcopy
%attr(755, root, root) /usr/bin/perror
%attr(755, root, root) /usr/bin/replace
@@ -334,6 +335,19 @@ fi
%attr(755, root, root) /usr/bin/mysqlbinlog
%attr(644, root, man) %doc /usr/man/man1/mysql.1*
+%attr(644, root, man) %doc /usr/man/man1/mysql.1*
+%attr(644, root, man) %doc /usr/man/man1/isamchk.1*
+%attr(644, root, man) %doc /usr/man/man1/isamlog.1*
+%attr(644, root, man) %doc /usr/man/man1/mysql_zap.1*
+%attr(644, root, man) %doc /usr/man/man1/mysqlaccess.1*
+%attr(644, root, man) %doc /usr/man/man1/mysqladmin.1*
+%attr(644, root, man) %doc /usr/man/man1/mysqld.1*
+%attr(644, root, man) %doc /usr/man/man1/mysqld_multi.1*
+%attr(644, root, man) %doc /usr/man/man1/mysqldump.1*
+%attr(644, root, man) %doc /usr/man/man1/mysqlshow.1*
+%attr(644, root, man) %doc /usr/man/man1/perror.1*
+%attr(644, root, man) %doc /usr/man/man1/replace.1*
+%attr(644, root, man) %doc /usr/man/man1/safe_mysqld.1*
%post shared
/sbin/ldconfig