- more macros in pre/post

Changed files:
    phpMyAdmin.spec -> 1.72

diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index f78ee093c67a375d0094b30b428e0ed1e768ce8d..c47118796820cd5b693f115aa8abdee70b2b1da1 100644 (file)
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -85,8 +85,8 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/httpd/%{name}.conf
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*phpMyAdmin.conf" /etc/httpd/httpd.conf; then
-       echo "Include /etc/httpd/phpMyAdmin.conf" >> /etc/httpd/httpd.conf
+if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf" /etc/httpd/httpd.conf; then
+       echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf
 elif [ -d /etc/httpd/httpd.conf ]; then
        ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf
 fi
@@ -100,7 +100,7 @@ if [ "$1" = "0" ]; then
        if [ -d /etc/httpd/httpd.conf ]; then
            rm -f /etc/httpd/httpd.conf/99_%{name}.conf
        else
-               grep -v "^Include.*phpMyAdmin.conf" /etc/httpd/httpd.conf > \
+               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
                if [ -f /var/lock/subsys/httpd ]; then