packages: apache/apache.spec - sed triggers: just delete lines, not replace...

[glen]

Author: glen                         Date: Sat Mar 10 10:24:25 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- sed triggers: just delete lines, not replace empty

---- Files affected:
packages/apache:
   apache.spec (1.673 -> 1.674) 

---- Diffs:

================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.673 packages/apache/apache.spec:1.674
--- packages/apache/apache.spec:1.673	Sat Mar 10 11:21:12 2012
+++ packages/apache/apache.spec	Sat Mar 10 11:24:19 2012
@@ -2724,10 +2724,10 @@
 %triggerpostun base -- %{name} < 2.4.0
 cp -f /etc/httpd/apache.conf{,.rpmsave}
 sed -i -e '
-	/^DefaultType.*/s,.*,,
-	/^Include /s,^Include ,IncludeOptional ,
-	/^NameVirtualHost.*/s,.*,,
-	/^User/s,^,LoadModule unixd_module modules/mod_unixd.so\n,
+	/^DefaultType/d
+	/^Include / s,^Include ,IncludeOptional ,
+	/^NameVirtualHost/d
+	/^User/ s,^,LoadModule unixd_module modules/mod_unixd.so\n,
 ' /etc/httpd/apache.conf
 sed -i -e '
 	s,^LockFile /var/run/httpd/accept.lock,Mutex file:/var/run/httpd/,g
@@ -2743,8 +2743,8 @@
 %triggerpostun mod_ssl -- %{name}-mod_ssl < 1:2.4.0
 cp -f /etc/httpd/conf.d/40_mod_ssl.conf{,.rpmsave}
 sed -i -e '
-	/^SSLMutex/s,^,#,
-	/^NameVirtualHost.*/s,.*,,
+	/^SSLMutex/ s,^,#,
+	/^NameVirtualHost/d
 ' /etc/httpd/conf.d/40_mod_ssl.conf
 
 %posttrans base
@@ -3520,6 +3520,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.674  2012/03/10 10:24:19  glen
+- sed triggers: just delete lines, not replace empty
+
 Revision 1.673  2012/03/10 10:21:12  glen
 - adapter
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.673&r2=1.674&f=u