Don't overwrite an existing /etc/xinetd.d/swat on install file since we

don't overwrite it on upgrade.

Does this make sense?
(This used to be commit 90b3dccfd421bac6516c298f85fcccc857c57989)

diff --git a/packaging/RedHat/samba2.spec.tmpl b/packaging/RedHat/samba2.spec.tmpl
index 73c2a3e985157159ef36e229565d9386ac8f74c4..c99b91238252cb62ce284baf8792b226af2db9e5 100644 (file)
--- a/packaging/RedHat/samba2.spec.tmpl
+++ b/packaging/RedHat/samba2.spec.tmpl
@@ -308,8 +308,8 @@ if [ -f /etc/inetd.conf ]; then
 fi
 
 # Add swat entry to xinetd.d if needed.
-if [ -d $RPM_BUILD_ROOT/etc/xinetd.d ]; then
-    mv /etc/samba/samba.xinetd /etc/xinetd.d/swat
+if [ -d $RPM_BUILD_ROOT/etc/xinetd.d -a ! -f /etc/xinetd.d/swat ]; then
+        mv /etc/samba/samba.xinetd /etc/xinetd.d/swat
 else
        rm -f /etc/samba/samba.xinetd
 fi