- simplify

Changed files:
    webapp.spec -> 1.11

diff --git a/webapp.spec b/webapp.spec
index 7ae0fa110846849d816a169a866d427035437efb..524f7448fc3550efc2056c0239a609d05cebf240 100644 (file)
--- a/webapp.spec
+++ b/webapp.spec
@@ -2,7 +2,7 @@ Summary:        Package that uses Apache configuration
 Summary(pl):   Pakiet u¿ywaj±cy konfiguracji Apache'a
 Name:          template-apache-package
 Version:       0.1
-Release:       0.15
+Release:       0.19
 License:       GPL
 Group:         Development
 BuildArch:     noarch
@@ -29,14 +29,12 @@ EOF
 %{?debug:set -x; echo "triggerin apache1 %{name}-%{version}-%{release} 1:[$1]; 2:[$2]"}
 if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d /etc/apache/conf.d ]; then
        ln -sf %{_sysconfdir}/apache-%{name}.conf /etc/apache/conf.d/99_%{name}.conf
+fi
+# restart apache if the config symlink is there
+if [ -L /etc/apache/conf.d/99_%{name}.conf ]; then
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
        fi
-else
-       # restart apache if the config symlink is there
-       if [ -L /etc/apache/conf.d/99_%{name}.conf ]; then
-               /etc/rc.d/init.d/apache restart 1>&2
-       fi
 fi
 
 %triggerun -- apache1 >= 1.3.33-2
@@ -55,14 +53,12 @@ fi
 %{?debug:set -x; echo "triggerin apache2 %{name}-%{version}-%{release}: 1:[$1]; 2:[$2]"}
 if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d /etc/httpd/httpd.conf ]; then
        ln -sf %{_sysconfdir}/apache-%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf
+fi
+# restart apache if the config symlink is there
+if [ -L /etc/httpd/httpd.conf/99_%{name}.conf ]; then
        if [ -f /var/lock/subsys/httpd ]; then
                /etc/rc.d/init.d/httpd restart 1>&2
        fi
-else
-       # restart apache if the config symlink is there
-       if [ -L /etc/httpd/httpd.conf/99_%{name}.conf ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
-       fi
 fi
 
 %triggerun -- apache >= 2.0.0