1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Manual merge.

This commit is contained in:
joerg@mysql.com
2005-05-25 18:11:03 +02:00

View File

@ -16,8 +16,8 @@
Name: MySQL Name: MySQL
Summary: MySQL: a very fast and reliable SQL database server Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases Group: Applications/Databases
Summary(pt_BR): MySQL: Um servidor SQL r<EFBFBD>pido e confi<EFBFBD>vel. Summary(pt_BR): MySQL: Um servidor SQL rápido e confiável.
Group(pt_BR): Aplica<EFBFBD><EFBFBD>es/Banco_de_Dados Group(pt_BR): Aplicações/Banco_de_Dados
Version: @MYSQL_NO_DASH_VERSION@ Version: @MYSQL_NO_DASH_VERSION@
Release: %{release} Release: %{release}
License: GPL License: GPL
@ -57,8 +57,8 @@ documentation and the manual for more information.
Release: %{release} Release: %{release}
Summary: MySQL: a very fast and reliable SQL database server Summary: MySQL: a very fast and reliable SQL database server
Group: Applications/Databases Group: Applications/Databases
Summary(pt_BR): MySQL: Um servidor SQL r<EFBFBD>pido e confi<EFBFBD>vel. Summary(pt_BR): MySQL: Um servidor SQL rápido e confiável.
Group(pt_BR): Aplica<EFBFBD><EFBFBD>es/Banco_de_Dados Group(pt_BR): Aplicações/Banco_de_Dados
Requires: fileutils sh-utils Requires: fileutils sh-utils
Provides: msqlormysql mysql-server mysql MySQL Provides: msqlormysql mysql-server mysql MySQL
Obsoletes: MySQL mysql mysql-server Obsoletes: MySQL mysql mysql-server
@ -92,7 +92,7 @@ Release: %{release}
Summary: MySQL - Client Summary: MySQL - Client
Group: Applications/Databases Group: Applications/Databases
Summary(pt_BR): MySQL - Cliente Summary(pt_BR): MySQL - Cliente
Group(pt_BR): Aplica<EFBFBD><EFBFBD>es/Banco_de_Dados Group(pt_BR): Aplicações/Banco_de_Dados
Obsoletes: mysql-client Obsoletes: mysql-client
Provides: mysql-client Provides: mysql-client
@ -102,7 +102,7 @@ This package contains the standard MySQL clients and administration tools.
%{see_base} %{see_base}
%description client -l pt_BR %description client -l pt_BR
Este pacote cont<EFBFBD>m os clientes padr<EFBFBD>o para o MySQL. Este pacote contém os clientes padrão para o MySQL.
%package ndb-storage %package ndb-storage
Release: %{release} Release: %{release}
@ -156,8 +156,8 @@ Release: %{release}
Requires: %{name}-client perl-DBI perl Requires: %{name}-client perl-DBI perl
Summary: MySQL - Benchmarks and test system Summary: MySQL - Benchmarks and test system
Group: Applications/Databases Group: Applications/Databases
Summary(pt_BR): MySQL - Medi<EFBFBD><EFBFBD>es de desempenho Summary(pt_BR): MySQL - Medições de desempenho
Group(pt_BR): Aplica<EFBFBD><EFBFBD>es/Banco_de_Dados Group(pt_BR): Aplicações/Banco_de_Dados
Provides: mysql-bench Provides: mysql-bench
Obsoletes: mysql-bench Obsoletes: mysql-bench
@ -167,14 +167,14 @@ This package contains MySQL benchmark scripts and data.
%{see_base} %{see_base}
%description bench -l pt_BR %description bench -l pt_BR
Este pacote cont<EFBFBD>m medi<EFBFBD><EFBFBD>es de desempenho de scripts e dados do MySQL. Este pacote contém medições de desempenho de scripts e dados do MySQL.
%package devel %package devel
Release: %{release} Release: %{release}
Summary: MySQL - Development header files and libraries Summary: MySQL - Development header files and libraries
Group: Applications/Databases Group: Applications/Databases
Summary(pt_BR): MySQL - Medi<EFBFBD><EFBFBD>es de desempenho Summary(pt_BR): MySQL - Medições de desempenho
Group(pt_BR): Aplica<EFBFBD><EFBFBD>es/Banco_de_Dados Group(pt_BR): Aplicações/Banco_de_Dados
Provides: mysql-devel Provides: mysql-devel
Obsoletes: mysql-devel Obsoletes: mysql-devel
@ -185,8 +185,8 @@ necessary to develop MySQL client applications.
%{see_base} %{see_base}
%description devel -l pt_BR %description devel -l pt_BR
Este pacote cont<EFBFBD>m os arquivos de cabe<EFBFBD>alho (header files) e bibliotecas Este pacote contém os arquivos de cabeçalho (header files) e bibliotecas
necess<EFBFBD>rias para desenvolver aplica<EFBFBD><EFBFBD>es clientes do MySQL. necessárias para desenvolver aplicações clientes do MySQL.
%package shared %package shared
Release: %{release} Release: %{release}
@ -226,8 +226,8 @@ Release: %{release}
Requires: %{name}-devel Requires: %{name}-devel
Summary: MySQL - embedded library Summary: MySQL - embedded library
Group: Applications/Databases Group: Applications/Databases
Summary(pt_BR): MySQL - Medi<EFBFBD><EFBFBD>es de desempenho Summary(pt_BR): MySQL - Medições de desempenho
Group(pt_BR): Aplica<EFBFBD><EFBFBD>es/Banco_de_Dados Group(pt_BR): Aplicações/Banco_de_Dados
Obsoletes: mysql-embedded Obsoletes: mysql-embedded
%description embedded %description embedded
@ -364,6 +364,9 @@ fi
(cd libmysql/.libs; tar cf $RBR/shared-libs.tar *.so*) (cd libmysql/.libs; tar cf $RBR/shared-libs.tar *.so*)
(cd libmysql_r/.libs; tar rf $RBR/shared-libs.tar *.so*) (cd libmysql_r/.libs; tar rf $RBR/shared-libs.tar *.so*)
# Now clean up
make clean
# #
# Only link statically on our i386 build host (which has a specially # Only link statically on our i386 build host (which has a specially
# patched static glibc installed) - ia64 and x86_64 run glibc-2.3 (unpatched) # patched static glibc installed) - ia64 and x86_64 run glibc-2.3 (unpatched)
@ -689,6 +692,10 @@ fi
# itself - note that they must be ordered by date (important when # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %changelog
* Wed May 25 2005 Joerg Bruehe <joerg@mysql.com>
- Added a "make clean" between separate calls to "BuildMySQL".
* Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com> * Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com>
- Enabled the "blackhole" storage engine for the Max RPM - Enabled the "blackhole" storage engine for the Max RPM