SPECS: template-apache-package.spec - use sed 4.0

[glen]

Author: glen                         Date: Sun Oct  2 11:42:54 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use sed 4.0

---- Files affected:
SPECS:
   template-apache-package.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/template-apache-package.spec
diff -u SPECS/template-apache-package.spec:1.22 SPECS/template-apache-package.spec:1.23
--- SPECS/template-apache-package.spec:1.22	Mon Aug 15 23:55:28 2005
+++ SPECS/template-apache-package.spec	Sun Oct  2 13:42:49 2005
@@ -8,6 +8,9 @@
 Group:		Development
 BuildRequires:	rpmbuild(macros) >= 1.226
 Requires:	apache >= 1.3.33-2
+%if %{with trigger}
+Requires(triggerpostun):	sed >= 4.0
+%endif
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -70,11 +73,8 @@
 fi
 
 # nuke very-old config location (is this needed?)
-umask 027
 if [ ! -d /etc/httpd/httpd.conf ]; then
-	grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \
-		/etc/httpd/httpd.conf.tmp
-	mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
+	sed -i -e "/^Include.*%{name}.conf/d" /etc/httpd/httpd.conf
 	if [ -f /var/lock/subsys/httpd ]; then
 		/etc/rc.d/init.d/httpd reload 1>&2
 	fi
@@ -112,6 +112,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2005/10/02 11:42:49  glen
+- use sed 4.0
+
 Revision 1.22  2005/08/15 21:55:28  glen
 - added missing %clean
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/template-apache-package.spec?r1=1.22&r2=1.23&f=u