Author: glen Date: Wed Nov 30 19:50:53 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- 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
---- Files affected:
SPECS:
template-webapp.spec (1.27 -> 1.28)
---- Diffs:
================================================================
Index: SPECS/template-webapp.spec
diff -u SPECS/template-webapp.spec:1.27 SPECS/template-webapp.spec:1.28
--- SPECS/template-webapp.spec:1.27 Fri Nov 25 23:09:10 2005
+++ SPECS/template-webapp.spec Wed Nov 30 20:50:48 2005
@@ -6,6 +6,9 @@
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}
@@ -78,7 +81,9 @@
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
@@ -90,12 +95,13 @@
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
@@ -147,6 +153,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.28 2005/11/30 19:50:48 glen
+- 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
+
Revision 1.27 2005/11/25 22:09:10 qboosh
- updated pl
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/template-webapp.spec?r1=1.27&r2=1.28&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
