packages (MYSQL_5_0): mysql/mysql.spec - logrotate is optional; rel 2

[glen]

Author: glen                         Date: Wed Aug  5 09:30:42 2009 GMT
Module: packages                      Tag: MYSQL_5_0
---- Log message:
- logrotate is optional; rel 2

---- Files affected:
packages/mysql:
   mysql.spec (1.353.2.73 -> 1.353.2.74) 

---- Diffs:

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.353.2.73 packages/mysql/mysql.spec:1.353.2.74
--- packages/mysql/mysql.spec:1.353.2.73	Sat Jul 25 16:07:30 2009
+++ packages/mysql/mysql.spec	Wed Aug  5 11:30:36 2009
@@ -27,7 +27,7 @@
 Summary(zh_CN.UTF-8):	MySQL数据库服务器
 Name:		mysql
 Version:	5.0.84
-Release:	1
+Release:	2
 License:	GPL + MySQL FLOSS Exception
 Group:		Applications/Databases
 #Source0:	ftp://ftp.mysql.com/pub/mysql/src/%{name}-%{version}.tar.gz
@@ -78,12 +78,12 @@
 Patch25:	%{name}-innodb_io_pattern.patch
 Patch26:	%{name}-innodb_fsync_source.patch
 Patch27:	%{name}-innodb_show_hashed_memory.patch
-Patch28:    %{name}-innodb_dict_size_limit.patch
-Patch29:    %{name}-innodb_extra_rseg.patch
-Patch30:    %{name}-innodb_thread_concurrency_timer_based.patch
-Patch31:    %{name}-split_buf_pool_mutex_fixed_optimistic_safe.patch
-Patch32:    %{name}-innodb_rw_lock.patch
-Patch33:    %{name}-mysql-test.patch
+Patch28:	%{name}-innodb_dict_size_limit.patch
+Patch29:	%{name}-innodb_extra_rseg.patch
+Patch30:	%{name}-innodb_thread_concurrency_timer_based.patch
+Patch31:	%{name}-split_buf_pool_mutex_fixed_optimistic_safe.patch
+Patch32:	%{name}-innodb_rw_lock.patch
+Patch33:	%{name}-mysql-test.patch
 # </percona>
 Patch34:	%{name}-errorlog-no-rename.patch
 Patch35:	%{name}-alpha-stack.patch
@@ -120,7 +120,6 @@
 Requires:	%{name}-charsets = %{version}-%{release}
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	/usr/bin/setsid
-Requires:	logrotate >= 3.7-4
 Requires:	rc-scripts >= 0.2.0
 Suggests:	mysql-client
 %{?with_tcpd:Suggests:	tcp_wrappers}
@@ -130,6 +129,7 @@
 Provides:	user(mysql)
 Obsoletes:	MySQL
 Obsoletes:	mysql-server
+Conflicts:	logrotate < 3.7-4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_libexecdir	%{_sbindir}
@@ -1098,6 +1098,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.353.2.74  2009/08/05 09:30:36  glen
+- logrotate is optional; rel 2
+
 Revision 1.353.2.73  2009/07/25 14:07:30  arekm
 - update opt flags to match configure.in flags
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.353.2.73&r2=1.353.2.74&f=u