From 2353a57cad0ab3e2be7ef97a22701e158eb51b67 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Go=C5=82aszewski?= Date: Wed, 11 Aug 2004 21:40:48 +0000 Subject: [PATCH] - more macros in pre/post Changed files: phpMyAdmin.spec -> 1.72 --- phpMyAdmin.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index f78ee09..c471187 100644 --- 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 -- 2.44.0