SPECS (DEVEL): mysql.spec - 5.1.1-beta, sql-bench is gone
glen
glen at pld-linux.org
Tue Oct 17 15:31:58 CEST 2006
Author: glen Date: Tue Oct 17 13:31:58 2006 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- 5.1.1-beta, sql-bench is gone
---- Files affected:
SPECS:
mysql.spec (1.324.2.2 -> 1.324.2.3)
---- Diffs:
================================================================
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.324.2.2 SPECS/mysql.spec:1.324.2.3
--- SPECS/mysql.spec:1.324.2.2 Wed Feb 22 08:55:23 2006
+++ SPECS/mysql.spec Tue Oct 17 15:31:51 2006
@@ -1,10 +1,27 @@
# $Revision$, $Date$
# TODO:
# - trigger that prepares system from pre-cluster into cluster
-# - trigger /etc/mysqld.conf into /etc/mysql/mysqld.conf. Solve possible
-# conflict with /var/lib/mysql/mysqld.conf
# - C(XX)FLAGS for innodb subdirs are overriden by ./configre!
# - http://bugs.mysql.com/bug.php?id=16470
+# - warning: Installed (but unpackaged) file(s) found:
+# /usr/bin/benchmark
+# /usr/bin/mysql_client_test
+# /usr/bin/mysql_upgrade
+# /usr/bin/mysqlslap
+# /usr/bin/test
+# /usr/bin/testsuite
+# /usr/lib/mysql/ha_blackhole.a
+# /usr/lib/mysql/ha_blackhole.la
+# /usr/lib/mysql/ha_blackhole.so.0.0.0
+# /usr/share/man/man1/myisam_ftdump.1.gz
+# /usr/share/man/man1/mysql_upgrade.1.gz
+# /usr/share/man/man1/mysqlman.1.gz
+# /usr/share/man/man1/mysqlslap.1.gz
+# /usr/share/mysql/errmsg.txt
+# /usr/share/mysql/mi_test_all
+# /usr/share/mysql/mi_test_all.res
+# /usr/share/mysql/ndb_size.tmpl
+# - innodb, dbd are dynamic (= as plugins) ?
#
# Conditional build:
%bcond_with bdb # Berkeley DB support
@@ -24,12 +41,12 @@
Summary(uk): MySQL - Ű×ÉÄËÉĘ SQL-ÓĹŇ×ĹŇ
Summary(zh_CN): MySQLĘýžÝżâˇţÎńĆ÷
Name: mysql
-Version: 5.1.6
+Version: 5.1.11
Release: 0.1
License: GPL + MySQL FLOSS Exception
Group: Applications/Databases
-Source0: http://mysql.dataphone.se/Downloads/MySQL-5.1/%{name}-%{version}-alpha.tar.gz
-# Source0-md5: da1e2d40b30373f0cce79a96f58fbf28
+Source0: http://mysql.dataphone.se/Downloads/MySQL-5.1/%{name}-%{version}-beta.tar.gz
+# Source0-md5: f5e807425247f7b726faefa232367fbd
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.logrotate
@@ -54,7 +71,6 @@
Patch8: %{name}-client-config.patch
Patch9: %{name}-build.patch
Patch10: %{name}-alpha.patch
-Patch11: %{name}-bug-14057.patch
URL: http://www.mysql.com/
BuildRequires: autoconf
BuildRequires: automake
@@ -89,6 +105,7 @@
Provides: user(mysql)
Obsoletes: MySQL
Obsoletes: mysql-server
+Obsoletes: mysql-bench < 5.1.11
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _libexecdir %{_sbindir}
@@ -341,45 +358,6 @@
ăĹĘ ĐÁËĹÔ ÍŚÓÔÉÔŘ ÓÔÁÔÉŢÎŚ ÂŚÂĚŚĎÔĹËÉ ĐŇĎÇŇÁÍŚÓÔÁ, ÎĹĎÂČŚÄÎŚ ÄĚŃ
ŇĎÚŇĎÂËÉ ĐŇĎÇŇÁÍ-ËĚŚ¤ÎÔŚ×.
-%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
@@ -430,7 +408,7 @@
Ten pakiet zawiera standardowego demona MySQL NDB CPC.
%prep
-%setup -q -n %{name}-%{version}-alpha
+%setup -q -n %{name}-%{version}-beta
%patch0 -p1
%{?with_tcpd:%patch1 -p1}
%patch2 -p1
@@ -448,7 +426,6 @@
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch11 -p1
%{__perl} -pi -e 's@(ndb_bin_am_ldflags)="-static"@$1=""@' configure.in
@@ -479,7 +456,7 @@
--with%{!?with_bdb:out}-berkeley-db \
--with%{!?with_innodb:out}-innodb \
--with%{!?with_raid:out}-raid \
- --with%{!?with_ssl:out}-openssl \
+ --with%{!?with_ssl:out}-ssl \
--with%{!?with_tcpd:out}-libwrap \
%{?with_big_tables:--with-big-tables} \
--with-comment="PLD Linux Distribution MySQL RPM" \
@@ -507,9 +484,7 @@
echo -e "all:\ninstall:\nclean:\nlink_sources:\n" > libmysqld/examples/Makefile
-%{__make} \
- benchdir=$RPM_BUILD_ROOT%{_datadir}/sql-bench
-
+%{__make}
%{__make} -C Docs mysql.info
%install
@@ -525,7 +500,6 @@
# 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
@@ -872,23 +846,6 @@
%defattr(644,root,root,755)
%{_libdir}/lib*[tr].a
-%files bench
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mysqltest
-%attr(755,root,root) %{_bindir}/mysql_client_test
-%attr(755,root,root) %{_bindir}/mysqlslap
-%{_mandir}/man1/mysqlslap.1*
-%dir %{_datadir}/sql-bench
-%{_datadir}/sql-bench/[CDRl]*
-%attr(755,root,root) %{_datadir}/sql-bench/[bcgirst]*
-# wrong dir?
-%{_datadir}/mysql/mi_test_all.res
-%attr(755,root,root) %{_datadir}/mysql/mi_test_all
-
-#%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
@@ -917,105 +874,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.324.2.3 2006/10/17 13:31:51 glen
+- 5.1.1-beta, sql-bench is gone
+
Revision 1.324.2.2 2006/02/22 07:55:23 glen
- %files update
Revision 1.324.2.1 2006/02/21 14:17:31 glen
- update to 5.1.6-alpha
-
-Revision 1.324 2006/02/15 17:25:14 arekm
-- rel 4; reconnect fixes
-
-Revision 1.323 2006/02/10 17:41:31 qboosh
-- missing dir, unified preambles/files order
-
-Revision 1.322 2006/02/10 17:08:12 baggins
-- release 3
-- charsets definitions are needed by both client and server
-- moved charsets to separate package
-- mysql and mysql-client R mysql-charsets
-
-Revision 1.321 2006/01/27 14:48:51 arekm
-- fix resolve_stack_dump problem
-
-Revision 1.320 2006/01/27 08:54:36 arekm
-- rel 2 (improved init script)
-
-Revision 1.319 2006/01/21 00:01:17 arekm
-- kill Icon: field (support for these is obsolete says jbj)
-
-Revision 1.318 2006/01/13 12:17:31 glen
-- sample for snapshot build
-
-Revision 1.317 2006/01/13 10:11:28 glen
-- package mysqld.sym into package when debug package is built
-
-Revision 1.316 2005/12/30 18:35:11 glen
-- 5.0.18
-
-Revision 1.315 2005/12/21 11:16:13 arekm
-- up to 5.0.17
-
-Revision 1.314 2005/12/19 20:44:52 glen
-- also update libdir in libmysqlclient_r.la to prevent libtool "library moved" warning
-- remove unused manuals
-
-Revision 1.313 2005/11/29 20:05:17 glen
-- re-add bug #14610 (mysqlhotcopy bug); rel 2
-
-Revision 1.312 2005/11/26 00:25:01 qboosh
-- added mysqlcheck(1) manual
-
-Revision 1.311 2005/11/23 22:23:46 blues
-- added enable-largefile=yes
-
-Revision 1.310 2005/11/23 09:17:58 arekm
-- up to 5.0.16
-
-Revision 1.309 2005/11/21 19:54:32 glen
-- rel 6
-
-Revision 1.308 2005/11/12 17:54:02 glen
-- add fix for mysqlhotcopy and stored procedure fix
-- enable big tables by default
-
-Revision 1.307 2005/11/09 00:16:42 glen
-- add #13707 (crash with insert delayed)
-- main package does not use anything from -libs, disabled
-- do also --with(out)-ndb-debug
-- rel 5
-
-Revision 1.306 2005/10/31 13:43:02 glen
-- %service is not fully in shell syntax; rel 4
-
-Revision 1.305 2005/10/29 12:05:05 arekm
-- rel 3
-
-Revision 1.304 2005/10/25 19:36:36 arekm
-- rel 2; alpha builds now
-
-Revision 1.303 2005/10/25 13:16:48 arekm
-- ugly hack for alpha
-
-Revision 1.302 2005/10/24 18:18:58 arekm
-- drop unneded workarounds and not-existing japenese files
-
-Revision 1.301 2005/10/24 17:20:46 arekm
-- merge from DEVEL; cut down changelog
-
-Revision 1.300 2005/10/20 15:04:08 glen
-- enable archive-storage-engine; rel 2
-
-Revision 1.299 2005/10/19 10:24:56 qboosh
-- updated to 4.1.15
-
-Revision 1.298 2005/09/22 12:24:06 glen
-- ignore error from mysql restart in %post. it doesn't give any value not having so, but having it could at least prevent duplicate mysql packages installed on system
-
-Revision 1.297 2005/09/17 11:51:46 arekm
-- new readline 5.0
-
-Revision 1.296 2005/08/25 18:25:11 glen
-- updated to 4.1.14
-
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mysql.spec?r1=1.324.2.2&r2=1.324.2.3&f=u
More information about the pld-cvs-commit
mailing list