- skip apache config placement on apache upgrades

Changed files:
    webapp.spec -> 1.5

diff --git a/webapp.spec b/webapp.spec
index 06890e2142cf5ee6435bb513368d04916a046957..7ba200d32c183bed3b4b4902aef144faf3437d77 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.11
+Release:       0.12
 License:       Public Domain
 Group:         Applications/WWW
 BuildArch:     noarch
@@ -30,7 +30,7 @@ EOF
 
 %triggerin -- apache1 >= 1.3.33-2
 %{?debug:set -x; echo "triggerin apache1 %{name}-%{version}-%{release} 1:[$1]; 2:[$2]"}
-if [ "$1" = "1" ] && [ -d %{_apache1dir}/conf.d ]; then
+if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{_apache1dir}/conf.d ]; then
        ln -sf %{_sysconfdir}/apache-%{name}.conf %{_apache1dir}/conf.d/99_%{name}.conf
        if [ -f /var/lock/subsys/apache ]; then
                /etc/rc.d/init.d/apache restart 1>&2
@@ -51,7 +51,7 @@ fi
 
 %triggerin -- apache >= 2.0.0
 %{?debug:set -x; echo "triggerin apache2 %{name}-%{version}-%{release}: 1:[$1]; 2:[$2]"}
-if [ "$1" = "1" ] && [ -d %{_apache2dir}/httpd.conf ]; then
+if [ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{_apache2dir}/httpd.conf ]; then
        ln -sf %{_sysconfdir}/apache-%{name}.conf %{_apache2dir}/httpd.conf/99_%{name}.conf
        if [ -f /var/lock/subsys/httpd ]; then
                /etc/rc.d/init.d/httpd restart 1>&2