[gridengine/f15] Remove qacct and sge_qmaster from BINFILES checks (Bug 803502)

[Orion Poplawski]

commit 45ffbc9b9c3b3b4655769f18038def99ad296c82
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Mar 14 16:23:07 2012 -0600

    Remove qacct and sge_qmaster from BINFILES checks (Bug 803502)

 gridengine-6.2beta-inst.patch |   15 ---------------
 gridengine-inst.patch         |   16 ++++++++++++++++
 gridengine.spec               |    7 +++++--
 3 files changed, 21 insertions(+), 17 deletions(-)
---
diff --git a/gridengine-inst.patch b/gridengine-inst.patch
new file mode 100644
index 0000000..b481c71
--- /dev/null
+++ b/gridengine-inst.patch
@@ -0,0 +1,16 @@
+diff -up GE2011.11/source/dist/util/install_modules/inst_common.sh.inst GE2011.11/source/dist/util/install_modules/inst_common.sh
+--- GE2011.11/source/dist/util/install_modules/inst_common.sh.inst	2012-03-14 16:00:29.832624837 -0600
++++ GE2011.11/source/dist/util/install_modules/inst_common.sh	2012-03-14 16:18:11.915818769 -0600
+@@ -370,10 +370,9 @@ CheckBinaries()
+ {
+ 
+    BINFILES="sge_coshepherd \
+-             sge_execd sge_qmaster  \
+              sge_shadowd \
+-             sge_shepherd qacct qalter qconf qdel qhold \
+-             qhost qlogin qmake qmod qmon qresub qrls qrsh qselect qsh \
++             sge_shepherd qalter qconf qdel qhold \
++             qhost qlogin qmake qmod qresub qrls qrsh qselect qsh \
+              qstat qsub qtcsh qping qquota sgepasswd"
+ 
+    WINBINFILES="sge_coshepherd sge_execd sge_shepherd  \
diff --git a/gridengine.spec b/gridengine.spec
index d5d8c61..ec8cf79 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -6,7 +6,7 @@
 
 Name:    gridengine
 Version: 6.2u5
-Release: 8%{?dist}
+Release: 8%{?dist}.1
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -36,7 +36,7 @@ Source12: maketarball
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=2845
 Patch1: gridengine-6.2beta-ssl.patch
 # Make inst_common.sh not look for qmon or sge_execd since they might not be installed
-Patch2: gridengine-6.2beta-inst.patch
+Patch2: gridengine-inst.patch
 # Don't need to make rc files in inst_common.sh
 # Partially http://gridengine.sunsource.net/issues/show_bug.cgi?id=2780
 Patch3: gridengine-6.2u5-rctemplates.patch
@@ -572,6 +572,9 @@ fi
 
 
 %changelog
+* Wed Mar 14 2012 Orion Poplawski <orion at cora.nwra.com> 6.2u5-8.1
+- Remove qacct and sge_qmaster from BINFILES checks (Bug 803502)
+
 * Fri May 6 2011 Orion Poplawski <orion at cora.nwra.com> 6.2u5-8
 - Add patches from opengridscheduler to fix vmem reporting and
   slotwise preemption