SPECS: apache.spec - moved .monitrc to monit-rc-apache.spec; relea...

[qboosh]

Author: qboosh                       Date: Tue Nov 21 12:28:57 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- moved .monitrc to monit-rc-apache.spec; release 8

---- Files affected:
SPECS:
   apache.spec (1.496 -> 1.497) 

---- Diffs:

================================================================
Index: SPECS/apache.spec
diff -u SPECS/apache.spec:1.496 SPECS/apache.spec:1.497
--- SPECS/apache.spec:1.496	Mon Nov 20 01:42:26 2006
+++ SPECS/apache.spec	Tue Nov 21 13:28:52 2006
@@ -36,7 +36,7 @@
 Summary(tr):	Lider WWW tarayýcý
 Name:		apache
 Version:	2.2.3
-Release:	7
+Release:	8
 License:	Apache Group License
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -46,7 +46,6 @@
 Source3:	%{name}-icons.tar.gz
 # Source3-md5:	2b085cbc19fd28536dc883f0b864cd83
 Source4:	%{name}.sysconfig
-Source5:	%{name}.monitrc
 Source6:	%{name}-httpd.conf
 Source7:	%{name}-common.conf
 Source8:	%{name}-mod_vhost_alias.conf
@@ -1860,7 +1859,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig,monit} \
+install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
 	$RPM_BUILD_ROOT%{_var}/{log/{httpd,archiv/httpd},{run,cache}/httpd,lock/mod_dav} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \
 	$RPM_BUILD_ROOT%{_datadir}/cgi-bin
@@ -1883,7 +1882,6 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/httpd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/httpd
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/httpd
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/monit/httpd.monitrc
 
 touch $RPM_BUILD_ROOT/var/log/httpd/{access,error,agent,referer,suexec}_log
 
@@ -2083,12 +2081,6 @@
 fi
 
 %triggerpostun base -- %{name} < 2.2.0
-# rename monitrc to be service name like other files
-if [ -f /etc/monit/apache.monitrc.rpmsave ]; then
-	mv -f /etc/monit/httpd.monitrc{,.rpmnew}
-	mv -f /etc/monit/{apache.monitrc.rpmsave,httpd.monitrc}
-fi
-
 # change HTTPD_CONF to point to new location. *only* if it's the
 # default config setting
 cp -f /etc/sysconfig/httpd{,.rpmorig}
@@ -2287,7 +2279,6 @@
 %attr(640,root,root) %{_sysconfdir}/magic
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/httpd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/monit/*.monitrc
 
 %dir %{_libexecdir}
 
@@ -2716,6 +2707,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.497  2006/11/21 12:28:52  qboosh
+- moved .monitrc to monit-rc-apache.spec; release 8
+
 Revision 1.496  2006/11/20 00:42:26  qboosh
 - fix libdir (to be lib64-aware) in layout file
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache.spec?r1=1.496&r2=1.497&f=u