SPECS: apache1.spec - monitrc moved to monit-rc-apache1 package (a...

[qboosh]

Author: qboosh                       Date: Sun Nov  4 17:20:16 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- monitrc moved to monit-rc-apache1 package (and .spec)
- release 2

---- Files affected:
SPECS:
   apache1.spec (1.173 -> 1.174) 

---- Diffs:

================================================================
Index: SPECS/apache1.spec
diff -u SPECS/apache1.spec:1.173 SPECS/apache1.spec:1.174
--- SPECS/apache1.spec:1.173	Sat Nov  3 03:10:03 2007
+++ SPECS/apache1.spec	Sun Nov  4 18:20:11 2007
@@ -29,7 +29,7 @@
 Summary(zh_CN.UTF-8):	Internet 上应用最广泛的 Web 服务程序。
 Name:		apache1
 Version:	1.3.39
-Release:	1
+Release:	2
 License:	Apache Group
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -41,7 +41,7 @@
 Source4:	%{name}.sysconfig
 Source5:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/apache-non-english-man-pages.tar.bz2
 # Source5-md5:	74ff6e8d8a7b365b48ed10a52fbeb84e
-Source6:	%{name}.monitrc
+
 Source7:	%{name}-httpd.conf
 Source8:	%{name}-common.conf
 Source9:	%{name}-mod_status.conf
@@ -1375,7 +1375,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%{_datadir}/errordocs \
 	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \
 	$RPM_BUILD_ROOT%{_libexecdir} \
@@ -1441,8 +1441,6 @@
 install %{SOURCE24}	$CFG/80_errordocs.conf
 install %{SOURCE17}	$CFG/80_mod_alias.conf
 
-install %{SOURCE6} $RPM_BUILD_ROOT/etc/monit/apache.monitrc
-
 ln -sf index.html.en $RPM_BUILD_ROOT%{_datadir}/html/index.html
 
 mv $RPM_BUILD_ROOT%{_sbindir}/apxs $RPM_BUILD_ROOT%{apxs}
@@ -1574,12 +1572,6 @@
 ' /etc/apache/apache.conf
 fi
 
-# rename monitrc to be service name like other files
-if [ -f /etc/monit/apache1.monitrc.rpmsave ]; then
-	mv -f /etc/monit/apache.monitrc{,.rpmnew}
-	mv -f /etc/monit/{apache1.monitrc.rpmsave,apache.monitrc}
-fi
-
 %triggerpostun mod_auth_db -- apache-mod_auth_db <= 1.3.20-2
 sed -i -e '/^\(Add\|Load\)Module.*mod_auth_dbm\.\(so\|c\)/d' /etc/apache/apache.conf
 
@@ -1883,7 +1875,6 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_common.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/apache
 %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}
 %if %{with lingerd}
 %attr(755,root,root) %{_libexecdir}/lingerd
@@ -2440,6 +2431,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.174  2007/11/04 17:20:11  qboosh
+- monitrc moved to monit-rc-apache1 package (and .spec)
+- release 2
+
 Revision 1.173  2007/11/03 02:10:03  baggins
 - updated openldap BR/R to 2.4.6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/apache1.spec?r1=1.173&r2=1.174&f=u