From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 26 Mar 2002 23:48:16 +0000 (+0000)
Subject: - don't zero httpd.conf; release 5
X-Git-Tag: apache-1_3_23-5~6
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=24fe3051b874106afd1fb8c9c96e31644a6e80c1;hp=79c7ba80d2d9c308004124f44e47d8b5d9a3186b;p=packages%2Fapache.git

- don't zero httpd.conf; release 5

Changed files:
    apache.spec -> 1.188
---

diff --git a/apache.spec b/apache.spec
index 4f74e1d..4ad4645 100644
--- a/apache.spec
+++ b/apache.spec
@@ -27,7 +27,7 @@ Summary(uk):	
 Summary(zh_CN):	Internet ÉÏÓ¦ÓÃ×î¹ã·ºµÄ Web ·þÎñ³ÌÐò¡£
 Name:		apache
 Version:	1.3.23
-Release:	4
+Release:	5
 License:	Apache Group License
 Group:		Networking/Daemons
 URL:		http://www.apache.org/
@@ -1039,7 +1039,7 @@ fi
 %preun mod_proxy
 if [ "$1" = "0" ]; then
 	%{_sbindir}/apxs -e -A -n proxy %{_libexecdir}/libproxy.so 1>&2
-	grep -v -q "^Include.*mod_proxy.conf" /etc/httpd/httpd.conf > \
+	grep -v "^Include.*mod_proxy.conf" /etc/httpd/httpd.conf > \
 		/etc/httpd/httpd.conf.tmp
 	mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
 	if [ -f /var/lock/subsys/httpd ]; then
@@ -1077,7 +1077,7 @@ fi
 %preun mod_status
 if [ "$1" = "0" ]; then
 	%{_sbindir}/apxs -e -A -n status %{_libexecdir}/mod_status.so 1>&2
-	grep -v -q "^Include.*mod_status.conf" /etc/httpd/httpd.conf > \
+	grep -v "^Include.*mod_status.conf" /etc/httpd/httpd.conf > \
 		/etc/httpd/httpd.conf.tmp
 	mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
 	if [ -f /var/lock/subsys/httpd ]; then
@@ -1131,7 +1131,7 @@ fi
 %preun mod_vhost_alias
 if [ "$1" = "0" ]; then
 	%{_sbindir}/apxs -e -A -n vhost_alias %{_libexecdir}/mod_vhost_alias.so 1>&2
-	grep -v -q "^Include.*mod_vhost_alias.conf" /etc/httpd/httpd.conf > \
+	grep -v "^Include.*mod_vhost_alias.conf" /etc/httpd/httpd.conf > \
 		/etc/httpd/httpd.conf.tmp
 	mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
 	if [ -f /var/lock/subsys/httpd ]; then