[gridengine] Update to opengridscheduler release 6.2u5p2 Drop patches applied upstream

[Orion Poplawski]

commit fdf6770f7857ead8ece10c104c851de149af8784
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Tue Sep 6 14:47:35 2011 -0600

    Update to opengridscheduler release 6.2u5p2
    Drop patches applied upstream

 .gitignore                       |    1 +
 gridengine-6.2u2_1-getline.patch |   51 --------------------------------------
 gridengine-6.2u5-slotwise.patch  |   14 ----------
 gridengine-6.2u5-vmem.patch      |   46 ----------------------------------
 gridengine.spec                  |   23 ++++++----------
 sources                          |    2 +-
 6 files changed, 11 insertions(+), 126 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 267deb7..2ac0cd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 ge-V62u5_TAG-src.tar.bz2
 gridengine-ppc.tar.gz
+/SGE6.2u5p2.tar.gz
diff --git a/gridengine.spec b/gridengine.spec
index 0cf0f5a..20c89e9 100644
--- a/gridengine.spec
+++ b/gridengine.spec
@@ -5,8 +5,8 @@
 %define gecos Grid Engine
 
 Name:    gridengine
-Version: 6.2u5
-Release: 10%{?dist}
+Version: 6.2u5p2
+Release: 1%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -19,7 +19,8 @@ Group:   Applications/System
 License: (BSD and LGPLv2+ and MIT and SISSL) and GPLv2+ and BSD with advertising
 URL:     http://gridengine.sunsource.net/
 #This is make with maketarball <TAG>
-Source0: ge-V62u5_TAG-src.tar.bz2
+Source0: http://downloads.sourceforge.net/gridscheduler/SGE%{version}/SGE%{version}.tar.gz
+#Source0: ge-V62u5_TAG-src.tar.bz2
 Source1: gridengine-ppc.tar.gz
 Source2: conf_defaults
 Source3: sge.csh
@@ -52,9 +53,6 @@ Patch7: gridengine-6.2u2_1-Werror.patch
 # Need to patch -Dant.library.dir=/usr/share/ant/lib to ant processes
 # http://gridengine.sunsource.net/issues/show_bug.cgi?id=3171
 Patch8: gridengine-6.2u4-ant.patch
-# Rename getline() to sge_getline()
-# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2980
-Patch9: gridengine-6.2u2_1-getline.patch
 # Support lesstif - http://gridengine.sunsource.net/issues/show_bug.cgi?id=2310
 Patch15: gridengine-6.2beta2-lesstif.patch
 # Make inst_sge exit with status 1 if usage is incorrect
@@ -71,10 +69,6 @@ Patch26: gridengine-6.2beta2-error.patch
 Patch27: gridengine-6.2u3-openssl.patch
 # Fix issue with hostnames and localhost
 Patch28: gridengine-6.2u5-gethostname.patch
-# Fix memory reporting issue, from opengridsecuduler
-Patch29: gridengine-6.2u5-vmem.patch
-# Fix slotwise preemption issue, from opengridsecuduler
-Patch30: gridengine-6.2u5-slotwise.patch
 # Don't build bundled jemalloc library
 Patch31: gridengine-jemalloc.patch
 # Fix some '//' in include paths
@@ -175,7 +169,7 @@ Programs needed to run a grid engine qmaster host
 
 
 %prep
-%setup -q -n gridengine -a 1
+%setup -q -n SGE%{version} -a 1
 #Copy Licenses and README file into build directory
 cp %SOURCE8 %SOURCE11 .
 #Remove unneeded shbangs
@@ -188,7 +182,6 @@ sed -i -e '/^#! *\/bin\/sh/d' source/dist/util/install_modules/*.sh
 %patch6 -p1 -b .db
 %patch7 -p1 -b .Werror
 %patch8 -p1 -b .ant
-%patch9 -p1 -b .getline
 %if !0%{?rhel}
 %patch15 -p1 -b .lesstif
 %endif
@@ -198,8 +191,6 @@ sed -i -e '/^#! *\/bin\/sh/d' source/dist/util/install_modules/*.sh
 %patch26 -p1 -b .error
 %patch27 -p1 -b .openssl
 %patch28 -p1 -b .gethostname
-%patch29 -p0 -b .vmem
-%patch30 -p0 -b .slotwise
 #Use system jemalloc
 %patch31 -p1 -b .jemalloc
 rm -r source/3rdparty/jemalloc
@@ -587,6 +578,10 @@ fi
 
 
 %changelog
+* Tue Sep 6 2011 Orion Poplawski <orion at cora.nwra.com> 6.2u5p2-1
+- Update to opengridscheduler release 6.2u5p2
+- Drop patches applied upstream
+
 * Fri Jul 29 2011 Orion Poplawski <orion at cora.nwra.com> 6.2u5-10
 - Move sge_*shepherd to execd sub-package
 
diff --git a/sources b/sources
index 245d86a..7b5f726 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1e81b2f28616ad44da5b628b1089b00c  ge-V62u5_TAG-src.tar.bz2
 5ba34d534cdeda9afe74cd367cb51ce0  gridengine-ppc.tar.gz
+be2d0bb3f679ff52fd2352c365b512fe  SGE6.2u5p2.tar.gz