SPECS: mysql.spec - rel 1; doc/bench subpackages are back

[arekm]

Author: arekm                        Date: Thu Dec 21 23:16:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 1; doc/bench subpackages are back

---- Files affected:
SPECS:
   mysql.spec (1.357 -> 1.358) 

---- Diffs:

================================================================
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.357 SPECS/mysql.spec:1.358
--- SPECS/mysql.spec:1.357	Sat Dec 16 22:48:26 2006
+++ SPECS/mysql.spec	Fri Dec 22 00:16:20 2006
@@ -26,7 +26,7 @@
 Summary(zh_CN):	MySQLĘýžÝżâˇţÎńĆ÷
 Name:		mysql
 Version:	5.1.14
-Release:	0.1
+Release:	1
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 Source0:	http://mysql.dataphone.se/Downloads/MySQL-5.1/%{name}-%{version}-beta.tar.gz
@@ -94,7 +94,6 @@
 Provides:	msqlormysql
 Provides:	user(mysql)
 Obsoletes:	MySQL
-Obsoletes:	mysql-bench < 5.1.11
 Obsoletes:	mysql-server
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -282,7 +281,6 @@
 Summary(pl):	Biblioteki dzielone MySQL
 Group:		Libraries
 Obsoletes:	libmysql10
-Obsoletes:	mysql-doc < 4.1.12
 
 %description libs
 Shared libraries for MySQL.
@@ -351,6 +349,45 @@
 ăĹĘ ĐÁËĹÔ ÍŚÓÔÉÔŘ ÓÔÁÔÉŢÎŚ ÂŚÂĚŚĎÔĹËÉ ĐŇĎÇŇÁÍŚÓÔÁ, ÎĹĎÂČŚÄÎŚ ÄĚŃ
 ŇĎÚŇĎÂËÉ ĐŇĎÇŇÁÍ-ËĚŚ¤ÎÔŚ×.
 
+%package bench
+Summary:	MySQL - Benchmarks
+Summary(pl):	MySQL - Programy testujące szybkość działania bazy
+Summary(pt):	MySQL - Mediçőes de desempenho
+Summary(ru):	MySQL - ÂĹÎŢÍÁŇËÉ
+Summary(uk):	MySQL - ÂĹÎŢÍÁŇËÉ
+Group:		Applications/Databases
+Requires:	%{name} = %{version}-%{release}
+Requires:	%{name}-client
+Requires:	perl(DBD::mysql)
+Obsoletes:	MySQL-bench
+
+%description bench
+This package contains MySQL benchmark scripts and data.
+
+%description bench -l pl
+Programy testujące szybkość serwera MySQL.
+
+%description bench -l pt_BR
+Este pacote contém mediçőes de desempenho de scripts e dados do MySQL.
+
+%description bench -l ru
+üÔĎÔ ĐÁËĹÔ ÓĎÄĹŇÖÉÔ ÓËŇÉĐÔŮ É ÄÁÎÎŮĹ ÄĚŃ ĎĂĹÎËÉ ĐŇĎÉÚ×ĎÄÉÔĹĚŘÎĎÓÔÉ
+MySQL.
+
+%description bench -l uk
+ăĹĘ ĐÁËĹÔ ÍŚÓÔÉÔŘ ÓËŇÉĐÔÉ ÔÁ ÄÁÎŚ ÄĚŃ ĎĂŚÎËÉ ĐŇĎÄŐËÔÉ×ÎĎÓÔŚ MySQL.
+
+%package doc
+Summary:	MySQL manual
+Summary(pl):	Podręcznik użytkownika MySQL
+Group:		Applications/Databases
+
+%description doc
+This package contains manual in HTML format.
+
+%description doc -l pl
+Podręcznik MySQL-a w formacie HTML.
+
 %package ndb
 Summary:	MySQL - NDB Storage Engine Daemon
 Summary(pl):	MySQL - demon silnika przechowywania danych NDB
@@ -481,7 +518,10 @@
 
 echo -e "all:\ninstall:\nclean:\nlink_sources:\n" > libmysqld/examples/Makefile
 
-%{__make}
+%{__make} \
+	benchdir=$RPM_BUILD_ROOT%{_datadir}/sql-bench
+
+%{__make} -C Docs mysql.info
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -492,6 +532,7 @@
 # Make install
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
+	benchdir=%{_datadir}/sql-bench \
 	libsdir=/tmp
 # libsdir is to avoid installing innodb static libs in $RPM_BUILD_ROOT../libs
 
@@ -864,6 +905,17 @@
 %defattr(644,root,root,755)
 %{_libdir}/lib*[tr].a
 
+%files bench
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/mysqltest
+%dir %{_datadir}/sql-bench
+%{_datadir}/sql-bench/[CDRl]*
+%attr(755,root,root) %{_datadir}/sql-bench/[bcgirst]*
+
+%files doc
+%defattr(644,root,root,755)
+%doc Docs/manual.html Docs/manual_toc.html
+
 %files ndb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/ndbd
@@ -893,6 +945,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.358  2006/12/21 23:16:20  arekm
+- rel 1; doc/bench subpackages are back
+
 Revision 1.357  2006/12/16 21:48:26  arekm
 - more bugfixes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.357&r2=1.358&f=u