[gridengine] - Add Requires: xorg-x11-fonts-ISO8859-1-100dpi xorg-x11-fonts-ISO8859-1-75dpi to qmon package (bu

[Orion Poplawski]

commit f2bf8335e8e04a63f208bf9684ba620cfff474fa
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Dec 6 14:07:28 2010 -0700

    - Add Requires: xorg-x11-fonts-ISO8859-1-100dpi xorg-x11-fonts-ISO8859-1-75dpi
      to qmon package (bug 657406)
    - Add patch to fix issue with hostnames (bug 654943)

 gridengine-6.2u5-gethostname.patch |   44 ++++++++++++++++++++++++++++++++++++
 gridengine.spec                    |   11 ++++++++-
 2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/gridengine-6.2u5-gethostname.patch b/gridengine-6.2u5-gethostname.patch
new file mode 100644
index 0000000..aee2dca
--- /dev/null
+++ b/gridengine-6.2u5-gethostname.patch
@@ -0,0 +1,44 @@
+--- gridengine/source/dist/util/install_modules/inst_common.sh.gethostname	2010-08-26 07:57:41.000000000 +1200
++++ gridengine/source/dist/util/install_modules/inst_common.sh	2010-11-23 10:24:51.932798405 +1300
+@@ -1569,18 +1569,37 @@ 
+ #-------------------------------------------------------------------------
+ # CheckForLocalHostResolving
+ #   "localhost", localhost.localdomain and 127.0.x.x are not supported
++#   if there are no other names or no other ip addresses
+ #   
+ #
+ CheckForLocalHostResolving()
+ {
+-   output=`$SGE_UTILBIN/gethostname| cut -f2 -d:`
++   output=`$SGE_UTILBIN/gethostname| grep "^Host" | cut -f2 -d:`
++
++   notok=true
++   hostok=false
++   ipok=false
+ 
+-   notok=false
+    for cmp in $output; do
+       case "$cmp" in
+-      localhost*|127.0*)
+-         notok=true
++      (localhost*|127.0*)
+          ;;
++      (*)
++         isIp=`IsIpAddress $cmp `
++         if [ $? -eq 1 ]; then
++	     if [ $hostok = true ]; then
++		 notok=false
++		 break
++	     fi
++	     ipok=true
++         else
++	     if [ $ipok = true ]; then
++		 notok=false
++		 break
++	     fi
++	     hostok=true
++         fi
++	 ;;
+       esac
+    done
+ 
diff --git a/gridengine.spec b/gridengine.spec
index 3ae42c5..fa5c3c8 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -6,7 +6,7 @@
 
 Name:    gridengine
 Version: 6.2u5
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -69,6 +69,8 @@ Patch25: gridengine-6.2u2_1-libs.patch
 Patch26: gridengine-6.2beta2-error.patch
 # Workaround for openssl-1.0 API change
 Patch27: gridengine-6.2u3-openssl.patch
+# Fix issue with hostnames and localhost
+Patch28: gridengine-6.2u5-gethostname.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch: ppc64
 
@@ -123,6 +125,7 @@ Summary: Gridengine qmon monitor
 Group: Development/Libraries
 License: BSD and LGPLv2+ and MIT and SISSL
 Requires: %{name} = %{version}-%{release}
+Requires: xorg-x11-fonts-ISO8859-1-100dpi xorg-x11-fonts-ISO8859-1-75dpi
 
 %description qmon
 The qmon graphical grid engine monitor
@@ -184,6 +187,7 @@ sed -i -e '/^#! *\/bin\/sh/d' source/dist/util/install_modules/*.sh
 %patch25 -p1 -b .libs
 %patch26 -p1 -b .error
 %patch27 -p1 -b .openssl
+%patch28 -p1 -b .gethostname
 sed -i.arch -e 's,/\$DSTARCH,,g' source/scripts/distinst
 #Don't ship rctemplates
 rm -rf source/dist/util/rctemplates
@@ -561,6 +565,11 @@ fi
 
 
 %changelog
+* Mon Dec 6 2010 Orion Poplawski <orion at cora.nwra.com> 6.2u5-6
+- Add Requires: xorg-x11-fonts-ISO8859-1-100dpi xorg-x11-fonts-ISO8859-1-75dpi
+  to qmon package (bug 657406)
+- Add patch to fix issue with hostnames (bug 654943)
+
 * Wed Aug 25 2010 - Orion Poplawski <orion at cora.nwra.com> - 6.2u5-5
 - Update instructions to referece ./my_configuration.conf (bug #557628)
 - Don't set IFS when reading conf file, breaks lots of stuff