]> git.pld-linux.org Git - packages/apache.git/commitdiff
- sed triggers: just delete lines, not replace empty
authorElan Ruusamäe <glen@pld-linux.org>
Sat, 10 Mar 2012 10:24:19 +0000 (10:24 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    apache.spec -> 1.674

apache.spec

index 21977e2b92ad1dc671f254ae217c5bef00f914e7..e6cf40cf24787f369033786b8b6134e172a3ee5d 100644 (file)
@@ -2723,10 +2723,10 @@ fi
 %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
@@ -2742,8 +2742,8 @@ sed -i -e '
 %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
This page took 0.044395 seconds and 4 git commands to generate.