[gridengine/el6/master: 12/12] Sync from devel

[Orion Poplawski]

commit 508d7571c678b12cf6e95257f420be271acd15ab
Merge: b20b8ac eace974
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Sep 20 14:43:13 2010 -0600

    Sync from devel

 .gitignore                         |    2 +-
 README                             |    2 +-
 conf_defaults                      |   16 +++
 gridengine-6.2u5-rctemplates.patch |   97 +++++++++++-----
 gridengine.spec                    |   28 ++++-
 my_configuration.conf              |  218 ------------------------------------
 sge.csh                            |    6 +-
 sge.sh                             |   10 +-
 sources                            |    2 +-
 9 files changed, 122 insertions(+), 259 deletions(-)
---
diff --cc gridengine.spec
index d279a7a,3ae42c5..f562346
--- a/gridengine.spec
+++ b/gridengine.spec
@@@ -6,7 -6,7 +6,7 @@@
  
  Name:    gridengine
  Version: 6.2u5
- Release: 3%{?dist}
 -Release: 5%{?dist}
++Release: 5%{?dist}.1
  Summary: Grid Engine - Distributed Computing Management software
  
  Group:   Applications/System
@@@ -551,6 -561,15 +561,18 @@@ f
  
  
  %changelog
++* Mon Sep 20 2010 - Orion Poplawski <orion at cora.nwra.com> - 6.2u5-5.1
++- Add -I%%{_includedir}/freetype2 to CFLAGS
++
+ * 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
+ - Set SGE_JVM_LIB_PATH to none by default so we don't setup JMF
+ 
+ * Wed Aug 11 2010 - Orion Poplawski <orion at cora.nwra.com> - 6.2u5-4
+ - Use upstream my_configuration.conf as template for default one (bugs 557628,566294)
+ - Set SGE_CELL in sge.sh/sge.csh (bug 620907)
+ 
  * Mon Jul 12 2010 - Orion Poplawski <orion at cora.nwra.com> - 6.2u5-3
  - Exclude ppc64 - no java 1.6.0