- avoid leaving around .rpmsave files which have already been put to new place

  this prevents those old .rpmsave being catched up by new triggers in future

Changed files:
    webapp.spec -> 1.28

diff --git a/webapp.spec b/webapp.spec
index 64109d59194839b0ede3a09e637cc01895ff6cb6..09eb67d5b4846523e9705be4163d8f9698e15fc0 100644 (file)
--- a/webapp.spec
+++ b/webapp.spec
@@ -5,6 +5,9 @@ Version:        0.2
 Release:       0.7
 License:       GPL
 Group:         Development
+#Source0:      %{name}-%{version}.tar.gz
+# Source0-md5: -
+#URL:          -
 BuildRequires: rpmbuild(macros) >= 1.264
 Requires:      webapps
 %if %{with trigger}
@@ -77,7 +80,9 @@ if [ -f /etc/%{name}/apache.conf.rpmsave ]; then
                cp -f %{_webapps}/%{_webapp}/httpd.conf{,.rpmnew}
                cp -f /etc/%{name}/apache.conf.rpmsave %{_webapps}/%{_webapp}/httpd.conf
        fi
+       rm -f /etc/%{name}/apache.conf.rpmsave
 fi
+
 # same but without separate %{_sysconfdir} for package
 if [ -f /etc/apache-%{name}.conf.rpmsave ]; then
        if [ -d /etc/apache/webapps.d ]; then
@@ -89,12 +94,13 @@ if [ -f /etc/apache-%{name}.conf.rpmsave ]; then
                cp -f %{_webapps}/%{_webapp}/httpd.conf{,.rpmnew}
                cp -f /etc/apache-%{name}.conf.rpmsave %{_webapps}/%{_webapp}/httpd.conf
        fi
+       rm -f /etc/apache-%{name}.conf.rpmsave
 fi
 
 # migrate from httpd (apache2) config dir
 if [ -f /etc/httpd/%{name}.conf.rpmsave ]; then
        cp -f %{_webapps}/%{_webapp}/httpd.conf{,.rpmnew}
-       cp -f /etc/httpd/%{name}.conf.rpmsave %{_webapps}/%{_webapp}/httpd.conf
+       mv -f /etc/httpd/%{name}.conf.rpmsave %{_webapps}/%{_webapp}/httpd.conf
        httpd_reload=1
 fi