SPECS: mysql.spec - monit merge dropped

[arekm]

Author: arekm                        Date: Sat Dec 16 20:56:55 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- monit merge dropped

---- Files affected:
SPECS:
   mysql.spec (1.354 -> 1.355) 

---- Diffs:

================================================================
Index: SPECS/mysql.spec
diff -u SPECS/mysql.spec:1.354 SPECS/mysql.spec:1.355
--- SPECS/mysql.spec:1.354	Sat Dec 16 21:22:46 2006
+++ SPECS/mysql.spec	Sat Dec 16 21:56:50 2006
@@ -36,7 +36,6 @@
 Source3:	%{name}.logrotate
 Source4:	%{name}d.conf
 Source5:	%{name}-clusters.conf
-Source6:	%{name}.monitrc
 Source7:	%{name}-ndb.init
 Source8:	%{name}-ndb.sysconfig
 Source9:	%{name}-ndb-mgm.init
@@ -480,7 +479,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,mysql,monit} \
+install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,mysql} \
 	   $RPM_BUILD_ROOT/var/{log/{archiv,}/mysql,lib/mysql} \
 	   $RPM_BUILD_ROOT{%{_infodir},%{_mysqlhome}}
 
@@ -498,7 +497,6 @@
 # This is template for configuration file which is created after 'service mysql init'
 install %{SOURCE4} mysqld.conf
 install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/mysql/clusters.conf
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/monit
 touch $RPM_BUILD_ROOT/var/log/mysql/{err,log,update}
 
 # remove innodb directives from mysqld.conf if mysqld is configured without
@@ -724,7 +722,6 @@
 %attr(754,root,root) /etc/rc.d/init.d/mysql
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/mysql
 %attr(640,root,mysql) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mysql/clusters.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/monit/*.monitrc
 %attr(755,root,root) %{_bindir}/innochecksum
 %attr(755,root,root) %{_bindir}/myisamchk
 %attr(755,root,root) %{_bindir}/myisamlog
@@ -890,6 +887,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.355  2006/12/16 20:56:50  arekm
+- monit merge dropped
+
 Revision 1.354  2006/12/16 20:22:46  arekm
 - merge from DEVEL
 
================================================================

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