[gridengine] Do not remove spool directory in execd uninstall script (bug 836102)

[Orion Poplawski]

commit 9262501acc400a4852f1e171332f4a3a23304e8d
Author: Orion Poplawski <orion at nwra.com>
Date:   Mon Jul 9 16:52:26 2012 -0600

    Do not remove spool directory in execd uninstall script (bug 836102)

 gridengine-rctemplates.patch |   24 ++++++++++++++++++++++++
 gridengine.spec              |    5 ++++-
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/gridengine-rctemplates.patch b/gridengine-rctemplates.patch
index 507f93a..fa8caac 100644
--- a/gridengine-rctemplates.patch
+++ b/gridengine-rctemplates.patch
@@ -328,3 +328,27 @@ diff -up GE2011.11p1/source/scripts/distinst.rctemplates GE2011.11p1/source/scri
                          $DEST_SGE_ROOT/util/sgeCA/*.cnf \
                          $DEST_SGE_ROOT/util/sgeSMF/*.xml \
                          $DEST_SGE_ROOT/util/sgeSMF/sge_smf_support.sh \
+--- GE2011.11p1/source/dist/util/install_modules/inst_execd_uninst.sh.rctemplates	2012-05-23 13:04:48.000000000 -0600
++++ GE2011.11p1/source/dist/util/install_modules/inst_execd_uninst.sh	2012-07-09 16:50:24.230166313 -0600
+@@ -281,11 +281,6 @@
+       $INFOTEXT "Removing spool directory [%s]" $SPOOL_DIR/$HOST_DIR
+       $INFOTEXT -log "Removing spool directory [%s]" $SPOOL_DIR/$HOST_DIR
+       ExecuteAsAdmin rm -R $SPOOL_DIR/$HOST_DIR
+- 
+-      if [ `ls -la $SPOOL_DIR | wc -l` -lt 4 ]; then
+-         Removedir $SPOOL_DIR
+-      fi
+-
+    fi
+ 
+    $INFOTEXT "Checking local spooldir configuration for host \"%s\"!" $exechost
+@@ -305,9 +300,6 @@
+          $INFOTEXT "Removing local spool directory [%s]" "$SPOOL_DIR/$HOST_DIR"
+          $INFOTEXT -log "Removing local spool directory [%s]" "$SPOOL_DIR/$HOST_DIR"
+          ExecuteAsAdmin rm -R $SPOOL_DIR/$HOST_DIR
+-         if [ `ls -la $SPOOL_DIR | wc -l` -lt 4 ]; then
+-            ExecuteAsAdmin rm -R $SPOOL_DIR
+-         fi
+       fi
+    fi
+ }
diff --git a/gridengine.spec b/gridengine.spec
index 6e75a47..94a9913 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -12,7 +12,7 @@
 
 Name:    gridengine
 Version: 2011.11p1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -635,6 +635,9 @@ fi
 
 
 %changelog
+* Mon Jul 9 2012 Orion Poplawski <orion at cora.nwra.com> 2011.11p1-2
+- Do not remove spool directory in execd uninstall script (bug 836102)
+
 * Mon Jul 9 2012 Orion Poplawski <orion at cora.nwra.com> 2011.11p1-1
 - Update to 2011.11p1
 - Drop env-code-injection, buffer-overflow, and symlink patches