Mon Aug 11 16:42:21 UTC 2008

Author: orion

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8868

Modified Files:
	.cvsignore gridengine.spec sources 
Added Files:
	README gridengine-6.2-rctemplates.patch 
	gridengine-6.2beta-inst.patch gridengine-6.2beta-ssl.patch 
	gridengine-6.2beta2-error.patch 
	gridengine-6.2beta2-lesstif.patch 
	gridengine-6.2beta2-libs.patch libcore.c 
Removed Files:
	aimk.site.lib.patch distinst.site.patch 
	gridengine-6.0u8-buffer.patch gridengine-6.0u8-lesstif.patch 
	gridengine-6.1pre-depend.patch gridengine-6.1u2-java.patch 
	gridengine-6.1u2-ppc.patch gridengine-6.1u2-qstat-xml.patch 
	gridengine-6.1u2-x86_64.patch gridengine-6.1u3-csh.patch 
	gridengine-6.1u3-libs.patch gridengine-6.1u3-open.patch 
	gridengine-6.1u4-execd.patch gridengine-6.1u4-qmon.patch 
	gridengine-6.1u4-rctemplates.patch qtcsh.sh.h.patch 
Log Message:
* Mon Aug 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-1
- Update to 6.2 final

--- NEW FILE README ---
Setting up a gridengine install using these RPMs is a little different than
using the standard Sun courtesy binaries.  The default configuration setup is geared
for a "reduced NFS" install with logs going into the /var/spool/gridengine
directories on each host.

On the qmaster (and any shadow hosts) install gridengine-qmaster, then:

 1)
  cd /usr/share/gridengine
 2)
   ./install_qmaster 

OR

   edit my_configuration.conf to make any needed changes and run:

   ./install_qmaster -auto my_configuration.conf

 3) Make sure the files act_qmaster and bootstrap from the directory
    /usr/share/gridengine/default/common/ are shared to all clients.  If you
    don't run with a shadow master configuration you can simply copy these
    files to the other machines.

If you change the default SGE_ROOT or SGE_CELL values, you will need to
edit /etc/sysconfig/gridengine and change them there as well for the startup
scripts to work.

On execution hosts install gridengine-execd, then:
  cd /usr/share/gridengine
  ./install_execd

On submit hosts install gridengine

gridengine-6.2-rctemplates.patch:

--- NEW FILE gridengine-6.2-rctemplates.patch ---
--- gridengine/source/dist/util/install_modules/inst_common.sh.rctemplates	2008-07-14 17:04:51.000000000 -0600
+++ gridengine/source/dist/util/install_modules/inst_common.sh	2008-07-15 14:51:07.000000000 -0600
@@ -285,8 +285,8 @@
       $INFOTEXT -log "Probably a permission problem. Please check file access permissions."
       $INFOTEXT -log "Check read/write permission. Check if SGE daemons are running."
 
-      MoveLog
       if [ "$ADMINRUN_NO_EXIT" != "true" ]; then
+         MoveLog
          exit 1
       fi
    fi
@@ -1463,6 +1453,7 @@
    if [ "$AUTO" = "false" ]; then
       return
    fi
+   ADMINRUN_NO_EXIT=true # ExecuteAsAdmin should not exit and call MoveLog
 
    GetAdminUser
 
--- gridengine/source/scripts/distinst.rctemplates	2008-06-04 04:04:10.000000000 -0600
+++ gridengine/source/scripts/distinst	2008-07-15 16:05:33.000000000 -0600
@@ -810,15 +810,9 @@
       Execute cp libs/jgdi/util/logging.properties.template $DEST_SGE_ROOT/util
       if [ $enforce_shlibpath = true ]; then
          Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh
-         Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template
-         Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template
-         Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template
          Execute grep -v "#ENFORCE_SHLIBPATH#" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
       else
          Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/create_settings.sh > $DEST_SGE_ROOT/util/create_settings.sh
-         Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgemaster_template > $DEST_SGE_ROOT/util/rctemplates/sgemaster_template
-         Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgeexecd_template > $DEST_SGE_ROOT/util/rctemplates/sgeexecd_template
-         Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/rctemplates/sgebdb_template > $DEST_SGE_ROOT/util/rctemplates/sgebdb_template
          Execute sed -e "s/#ENFORCE_SHLIBPATH#//" dist/util/install_modules/inst_common.sh > $DEST_SGE_ROOT/util/install_modules/inst_common.sh
       fi
       Cleanup util
@@ -833,7 +827,6 @@
 
       Execute chmod 755 $DEST_SGE_ROOT/util/install_modules \
 			$DEST_SGE_ROOT/util/upgrade_modules \
-                        $DEST_SGE_ROOT/util/rctemplates \
                         $DEST_SGE_ROOT/util/resources \
                         $DEST_SGE_ROOT/util/sgeCA \
                         $DEST_SGE_ROOT/util/resources/calendars \
@@ -858,7 +851,6 @@
                         $DEST_SGE_ROOT/util/resources/starter_methods/*
 
       Execute chmod 644 $DEST_SGE_ROOT/util/install_modules/* \
-                        $DEST_SGE_ROOT/util/rctemplates/* \
                         $DEST_SGE_ROOT/util/sgeCA/*.cnf \
                         $DEST_SGE_ROOT/util/sgeSMF/*.xml \
                         $DEST_SGE_ROOT/util/sgeSMF/sge_smf_support.sh \
--- gridengine/source/dist/util/install_modules/inst_qmaster.sh.rctemplates	2008-07-15 16:03:19.000000000 -0600
+++ gridengine/source/dist/util/install_modules/inst_qmaster.sh	2008-07-15 16:09:03.000000000 -0600
@@ -1216,7 +1216,7 @@
          exit 1
       fi
    else
-      $SGE_STARTUP_FILE -qmaster
+      /sbin/service sgemaster start
    fi
    CheckRunningDaemon sge_qmaster
    run=$?
--- gridengine/source/dist/util/install_modules/inst_execd.sh.rctemplates	2008-07-15 16:03:19.000000000 -0600
+++ gridengine/source/dist/util/install_modules/inst_execd.sh	2008-07-15 16:09:53.000000000 -0600
@@ -430,7 +430,7 @@
          exit 1
       fi
    else
-      $SGE_STARTUP_FILE
+      /sbin/server sge_execd start
    fi
    $INFOTEXT -wait -auto $AUTO -n "\nHit <RETURN> to continue >> "
    $CLEAR
--- gridengine/source/dist/inst_sge.rctemplates	2008-07-22 09:32:03.000000000 -0600
+++ gridengine/source/dist/inst_sge	2008-08-11 09:43:32.000000000 -0600
@@ -567,8 +567,6 @@
    fi
    AddJMXFiles
    RestoreSequenceNumberFiles $QMDIR #Restore jobseqnum and arseqnum
-   CreateSGEStartUpScripts $euid true master
-   CreateSGEStartUpScripts $euid true execd
    CreateSettingsFile
    InitCA
    SetupRcScriptNames master #New qmaster RC script/SMF
@@ -713,7 +711,6 @@
       Makedir $COMMONDIR
       ProcessSGEClusterName "bdb"
       SetSpoolingOptions
-      AddSGEStartUpScript $euid "bdb"
       PrepareRPCServerStart
       GiveBerkelyHints
    else
@@ -763,11 +760,8 @@
  AddDefaultUsersets
  AddCommonFiles
  AddJMXFiles
- CreateSGEStartUpScripts $euid true master
- CreateSGEStartUpScripts $euid true execd
  CreateSettingsFile
  InitCA
- AddSGEStartUpScript $euid master
  StartQmaster
  AddWindowsAdmin
  AddHosts
@@ -937,7 +931,6 @@
       GetLocalExecdSpoolDir
       AddLocalConfiguration_With_Qconf
       AddSubmitHostsExecd
-      AddSGEStartUpScript $euid execd
       SetupWinSvc execinst     #service install during execd installation -> param: execinst
       StartExecd
       AddQueue
@@ -971,7 +964,6 @@
       CheckHostNameResolving install
       GetLocalExecdSpoolDir
       AddLocalConfiguration_With_Qconf
-      AddSGEStartUpScript $euid execd
       SetupWinSvc execinst  #service install during execd installation -> param: execinst
       StartExecd
       AddQueue
@@ -1221,7 +1213,6 @@
       if [ $SHADOW_HOST = `$SGE_UTILBIN/gethostname -aname` ]; then
          . $SGE_ROOT/$SGE_CELL/common/settings.sh
          SGE_ARCH=`$SGE_ROOT/util/arch`
-         AddSGEStartUpScript $euid shadow
 	 $INFOTEXT "Starting sge_shadowd on host %s\n" $SHADOW_HOST
 	 if [ "$SGE_ENABLE_SMF" = "true" ]; then
 	    $SVCADM enable -s "svc:/application/sge/shadowd:$SGE_CLUSTER_NAME"
@@ -1257,7 +1248,6 @@
             . $SGE_ROOT/$SGE_CELL/common/settings.sh
             SGE_ARCH=`$SGE_ROOT/util/arch`
             $SGE_ROOT/bin/$SGE_ARCH/sge_shadowd &
-            AddSGEStartUpScript $euid shadow
          else
               echo ". $SGE_ROOT/$SGE_CELL/common/settings.sh; SGE_ARCH=`$SGE_ROOT/util/arch`; $SGE_ROOT/bin/$SGE_ARCH/sge_shadowd &" | $SHELL_NAME $SHADOW /bin/sh &
               #TODO: install rc script
@@ -1444,20 +1434,6 @@
 
    COMMONDIR=$SGE_CELL/common
 
-   CreateSGEStartUpScripts 0 true master
-   CreateSGEStartUpScripts 0 true execd
-   
-   $INFOTEXT "\nYour new startup scripts are created. You will find them in the\n" \
-             "directory:\n\n" \
-             "   %s\n\n" \
-             "Your old startup scripts are saved in this directory as\n\n" \
-             "   %s\n" \
-             "   %s\n\n" \
-             \$SGE_ROOT/$COMMONDIR sgemaster_$DATE sgeexecd_$DATE
-   
-   $INFOTEXT "Please now copy the new startup scripts to the system wide rc\n" \
-             "file location on all qmaster, shadowd and execution hosts."
-   
 fi
 
 exit 0

gridengine-6.2beta-inst.patch:

--- NEW FILE gridengine-6.2beta-inst.patch ---
--- gridengine/source/dist/util/install_modules/inst_common.sh.inst	2008-04-11 13:54:34.000000000 -0600
+++ gridengine/source/dist/util/install_modules/inst_common.sh	2008-04-11 13:55:59.000000000 -0600
@@ -342,10 +342,10 @@
 {
 
    BINFILES="sge_coshepherd \
-             sge_execd sge_qmaster  \
+             sge_qmaster  \
              sge_shadowd \
              sge_shepherd qacct qalter qconf qdel qhold \
-             qhost qlogin qmake qmod qmon qresub qrls qrsh qselect qsh \
+             qhost qlogin qmake qmod qresub qrls qrsh qselect qsh \
              qstat qsub qtcsh qping qquota sgepasswd"
 
    WINBINFILES="sge_coshepherd sge_execd sge_shepherd  \

gridengine-6.2beta-ssl.patch:

--- NEW FILE gridengine-6.2beta-ssl.patch ---
--- gridengine/source/aimk.ssl	2008-05-22 15:16:17.000000000 -0600
+++ gridengine/source/aimk	2008-05-22 15:18:06.000000000 -0600
@@ -337,7 +337,7 @@
 set SEC               = 1
 set SECFLAGS          = "-DSECURE -I$OPENSSL_HOME/include"
 set SECLIB            = ""
-set SECLIBS_STATIC    = "$OPENSSL_HOME/lib/libssl.a $OPENSSL_HOME/lib/libcrypto.a"
+set SECLIBS_STATIC    = "-lssl"
 set KLFLAGS           = "-L$OPENSSL_HOME/lib"
 
 set CORELIB           = ""

gridengine-6.2beta2-error.patch:

--- NEW FILE gridengine-6.2beta2-error.patch ---
--- gridengine/source/common/msg_common.h.error	2008-06-02 04:02:32.000000000 -0600
+++ gridengine/source/common/msg_common.h	2008-07-15 16:27:00.000000000 -0600
@@ -64,6 +64,7 @@
 #define MSG_FILE_CANNOT_WRITE_SS                                     _MESSAGE(23030, _("unable to write to file "SFN": "SFN))
 #define MSG_FILE_CANNOT_FLUSH_SS                                     _MESSAGE(23031, _("unable to flush file "SFN": "SFN))
 #define MSG_CONF_THEPATHGIVENFORXMUSTSTARTWITHANY_S                  _MESSAGE(23032, _("denied: the path given for "SFQ" must start with a \"/\""))
+#define MSG_FILE_CANNOT_CHOWN                                     _MESSAGE(23033, _("unable to chown file "SFN": "SFN))
 
 /*
 ** parse_job_cull.c
--- gridengine/source/libs/uti/sge_edit.c.error	2006-11-23 06:05:11.000000000 -0700
+++ gridengine/source/libs/uti/sge_edit.c	2008-07-15 16:23:24.000000000 -0600
@@ -64,7 +64,11 @@
       return -1;
    }
 
-   chown(fname, myuid, mygid);
+   if (chown(fname, myuid, mygid) != 0) {
+      ERROR((SGE_EVENT, MSG_FILE_CANNOT_CHOWN, fname));
+      DEXIT;
+      return -1;
+   }
 
    pid = fork();
    if (pid) {

gridengine-6.2beta2-lesstif.patch:

--- NEW FILE gridengine-6.2beta2-lesstif.patch ---
--- gridengine/source/3rdparty/qmon/iconlist/IconList.c.lesstif	2006-11-30 06:29:21.000000000 -0700
+++ gridengine/source/3rdparty/qmon/iconlist/IconList.c	2008-07-15 16:34:19.000000000 -0600
@@ -54,50 +54,6 @@
 #undef NeedWidePrototypes
 #endif
 
-#ifndef SOLARIS
-#if XmVersion >= 2000
-extern void _XmResizeObject(
-                        Widget g,
-#ifdef NeedWidePrototypes
-                        int width,
-                        int height,
-                        int border_width) ;
-#else
-                        Dimension width,
-                        Dimension height,
-                        Dimension border_width) ;
-#endif /* NeedWidePrototypes */
-extern void _XmMoveObject(
-                        Widget g,
-#ifdef NeedWidePrototypes
-                        int x,
-                        int y) ;
-#else
-                        Position x,
-                        Position y) ;
-#endif /* NeedWidePrototypes */
-extern void _XmDrawHighlight(
-                        Display *display,
-                        Drawable d,
-                        GC gc,
-#ifdef NeedWidePrototypes
-                        int x,
-                        int y,
-                        int width,
-                        int height,
-                        int highlight_thick,
-#else
-                        Position x,
-                        Position y,
-                        Dimension width,
-                        Dimension height,
-                        Dimension highlight_thick,
-#endif /* NeedWidePrototypes */
-                        int line_style) ;
-
-#endif
-#endif
-
 #include "DumbClip.h"
 #include "IconListP.h"
 
--- gridengine/source/3rdparty/qmon/Xmt310/Xmt/PixmapCvt.c.lesstif	2001-07-18 05:06:03.000000000 -0600
+++ gridengine/source/3rdparty/qmon/Xmt310/Xmt/PixmapCvt.c	2008-07-15 16:34:19.000000000 -0600
@@ -72,13 +72,6 @@
     XmRPrimForegroundPixmap,
     XmRManForegroundPixmap,
     XmRGadgetPixmap
-#if XmVersion >= 2000
-    ,
-    XmRLargeIconPixmap ,
-    XmRSmallIconPixmap,
-    XmRDynamicPixmap
-#endif
-    
 };
 
 #if NeedFunctionPrototypes
--- gridengine/source/3rdparty/qmon/Xmt310/Xmt/Layout.c.lesstif	2001-07-18 05:06:02.000000000 -0600
+++ gridengine/source/3rdparty/qmon/Xmt310/Xmt/Layout.c	2008-07-15 16:34:19.000000000 -0600
@@ -492,6 +492,12 @@
     if (!lw->layout.font)
         XmeRenderTableGetDefaultFont(lw->layout.render_table,
                                      &lw->layout.font);
+    /*
+     * The previous fails with lesstif, try again...
+     */
+    if (!lw->layout.font)
+        _XmFontListGetDefaultFont(lw->layout.font_list,
+                                     &lw->layout.font);
 #endif
     
     /* figure out resolution independence values */

gridengine-6.2beta2-libs.patch:

--- NEW FILE gridengine-6.2beta2-libs.patch ---
--- gridengine/source/3rdparty/qmon/ltree/Makefile.aimk.libs	2008-02-01 14:19:16.000000000 -0700
+++ gridengine/source/3rdparty/qmon/ltree/Makefile.aimk	2008-02-01 14:19:09.000000000 -0700
@@ -27,7 +27,7 @@
 	$(RANLIB) libXltree.a
 
 libXltree$(SHAREDEXT): $(XLTREE_OBJS)
-	$(SHAREDLD) $(XLFLAGS) $(GSHARED_LFLAGS) -o libXltree$(SHAREDEXT) $(XLTREE_OBJS) $(XLIBS)
+	$(SHAREDLD) $(XLFLAGS) $(GSHARED_LFLAGS) -o libXltree$(SHAREDEXT) $(XLTREE_OBJS) -lXm
 
 Xltree_clean:
 	$(RM) $(XLTREE_OBJS) libXltree.a libXltree$(SHAREDEXT)
--- gridengine/source/libs/japi/Makefile	2008-05-22 15:35:11.000000000 -0600
+++ gridengine/source/libs/japi/Makefile.libs	2008-04-24 03:58:30.000000000 -0600
@@ -100,7 +100,7 @@
 ###############################################################################
 libdrmaa$(SHAREDEXT).1.0:  $(JAPILIB_10) $(JAPI_DEPEND_OBJS) $(DRMAALIB_OBJS) $(DRMAA_OBJS) $(WINGRIDLIB_DEP)
 	$(SHAREDLD) $(SHARED_LFLAGS) $(SONAME_LFLAG_DRMAA10) -o libdrmaa$(SHAREDEXT).1.0 $(DRMAALIB_10_OBJS) $(DRMAA_OBJS) $(JAPILIB_10) $(JAPI_ADD_OBJS) \
-      $(SECLIB) $(WINGRIDLIB) $(LIBS) $(DLLIB) \
+      $(SECLIB) $(WINGRIDLIB) $(DLLIB) -lpthread \
    && ../scripts/nonreentrant.sh -a `../dist/util/arch` -w libdrmaa$(SHAREDEXT).1.0
 
 # Needed to compile howtos, examples, and unit tests


--- NEW FILE libcore.c ---
/*
 * Place holder library to ensure prctl(PR_SET_DUMPABLE, 1) is done after
 * each setuid(), seteuid(), setgid(), and setegid()
 */
#include <sys/types.h>
#include <dlfcn.h>
#include <pthread.h>
#include <sys/prctl.h>

static pthread_once_t only_once = PTHREAD_ONCE_INIT;

static int (*setuid_func)(uid_t uid) = NULL;
static int (*seteuid_func)(uid_t uid) = NULL;
static int (*setgid_func)(gid_t gid) = NULL;
static int (*setegid_func)(gid_t gid) = NULL;

static void init_funcs(void)
{
    setuid_func = (int (*)(uid_t uid))dlsym(RTLD_NEXT,  "setuid");
   seteuid_func = (int (*)(uid_t uid))dlsym(RTLD_NEXT, "seteuid");
    setgid_func = (int (*)(gid_t uid))dlsym(RTLD_NEXT,  "setgid");
   setegid_func = (int (*)(gid_t uid))dlsym(RTLD_NEXT, "setegid");
}

#define WRAP(func, clib_func, t) \
int func(t uid) \
{ \
   pthread_once(&only_once, init_funcs); \
   int ret = clib_func(uid); \
   prctl(PR_SET_DUMPABLE, 1, 42, 42, 42); \
   return ret; \
}

WRAP(setuid,  setuid_func,  uid_t)
WRAP(seteuid, seteuid_func, uid_t)
WRAP(setgid,  setgid_func,  gid_t)
WRAP(setegid, setegid_func, gid_t)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	7 May 2008 03:27:55 -0000	1.3
+++ .cvsignore	11 Aug 2008 16:41:50 -0000	1.4
@@ -1,2 +1,2 @@
+ge-V62_TAG-src.tar.gz
 gridengine-ppc.tar.gz
-ge-V61u4_TAG-src.tar.gz


Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gridengine.spec	7 May 2008 03:27:55 -0000	1.3
+++ gridengine.spec	11 Aug 2008 16:41:50 -0000	1.4
@@ -5,7 +5,7 @@
 %define gecos Grid Engine
 
 Name:    gridengine
-Version: 6.1u4
+Version: 6.2
 Release: 1%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
@@ -18,7 +18,7 @@
 # which is not used or linked by other parts of gridengine.
 License: (BSD and LGPLv2+ and MIT and SISSL) and GPLv2+ and BSD with advertising
 URL:     http://gridengine.sunsource.net/
-Source0: http://gridengine.sunsource.net/files/documents/7/169/ge-V61u4_TAG-src.tar.gz
+Source0: http://gridengine.sunsource.net/files/documents/7/181/ge-V62_TAG-src.tar.gz
 Source1: gridengine-ppc.tar.gz
 Source2: my_configuration.conf
 Source3: sge.csh
@@ -28,30 +28,34 @@
 Source7: bootstrap
 Source8: Licenses
 Source9: gridengine.sysconfig
-Patch0: distinst.site.patch
-Patch2: aimk.site.lib.patch
-Patch3: gridengine-6.1u2-ppc.patch
-Patch6: qtcsh.sh.h.patch
+Source10: http://gridengine.sunsource.net/nonav/issues/showattachment.cgi/165/libcore.c
+Source11: README
+# Link ssl libraries dynamically
+Patch0: gridengine-6.2beta-ssl.patch
+# Make inst_common.sh not look for qmon or sge_execd since they might not be installed
+Patch1: gridengine-6.2beta-inst.patch
+# Don't need to make rc files in inst_common.sh
+Patch2: gridengine-6.2-rctemplates.patch
+# aimk sets -Werror, but there are lots of warnings
+# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2112
 Patch7: gridengine-6.1pre-Werror.patch
-Patch10: gridengine-6.1pre-depend.patch
-Patch13: gridengine-6.0u8-buffer.patch
-Patch14: gridengine-6.1u2-x86_64.patch
-Patch15: gridengine-6.0u8-lesstif.patch
-Patch16: gridengine-6.1u2-java.patch
-Patch17: gridengine-6.1u3-open.patch
-Patch18: gridengine-6.1u4-qmon.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
+# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2586
 Patch19: gridengine-6.1u2-auto.patch
-Patch20: gridengine-6.1u2-qstat-xml.patch
-Patch21: gridengine-6.1u4-execd.patch
+# Don't use rpaths
 Patch22: gridengine-6.1u3-rpath.patch
-Patch23: gridengine-6.1u4-rctemplates.patch
-Patch25: gridengine-6.1u3-libs.patch
-Patch26: gridengine-6.1u3-csh.patch
+# Fix linking with proper libs
+# http://gridengine.sunsource.net/issues/show_bug.cgi?id=2588
+Patch25: gridengine-6.2beta2-libs.patch
+# Handle ignoring return codes
+Patch26: gridengine-6.2beta2-error.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: /bin/csh, openssl-devel, db4-devel, ncurses-devel, pam-devel
 BuildRequires: lesstif-devel, libXmu-devel, libXpm-devel
-BuildRequires: java-devel, ant-junit, javacc, ant-nodeps
+BuildRequires: java-devel >= 1:1.6.0, javacc, ant-junit, ant-nodeps
 BuildRequires: elfutils-libelf-devel, net-tools
 BuildRequires: fedora-usermgmt-devel
 Requires(posttrans): /usr/sbin/alternatives
@@ -133,29 +137,19 @@
 
 %prep
 %setup -q -n gridengine -a 1
-#Copy Licenses file into build directory
-cp %SOURCE8 .
+#Copy Licenses and README file into build directory
+cp %SOURCE8 %SOURCE11 .
 #Remove unneeded shbangs
 sed -i -e '/^#! *\/bin\/sh/d' source/dist/util/install_modules/*.sh
-%patch0 -p1
-%patch2 -p1 -b .lib
-%patch3 -p1 -b .ppc
-%patch6 -p1
+%patch0 -p1 -b .ssl
+%patch1 -p1 -b .inst
+%patch2 -p1 -b .rctemplates
 %patch7 -p1 -b .Werror
-%patch10 -p1 -b .depend
-%patch13 -p1 -b .buffer
-%patch14 -p1 -b .x86_64
 %patch15 -p1 -b .lesstif
-%patch16 -p1 -b .java
-%patch17 -p1 -b .open
-%patch18 -p1 -b .qmon
 %patch19 -p1 -b .auto
-%patch20 -p1 -b .qstat-xml
-%patch21 -p1 -b .execd
 %patch22 -p1 -b .rpath
-%patch23 -p1 -b .rctemplates
 %patch25 -p1 -b .libs
-%patch26 -p1 -b .csh
+%patch26 -p1 -b .error
 sed -i.arch -e 's,/\$DSTARCH,,g' source/scripts/distinst
 #Don't ship rctemplates
 rm -rf source/dist/util/rctemplates
@@ -173,6 +167,29 @@
 %build
 export JAVA_HOME=%{java_home}
 cd source
+#Setup paths
+cat > aimk.private <<EOF
+set OPENSSL_HOME = /usr
+set BERKELEYDB_HOME = /usr
+set BDB_INCLUDE_SUBDIR = ../include
+set BDB_LIB_SUBDIR = ../%{_lib}
+set KRB_HOME = /usr
+set MAN2HTMLPATH = /usr/bin
+set GROFFPATH = /usr/bin
+set SWIG = /usr/bin/swig
+set PERL = /usr/bin/perl
+set TCLSH = /usr/bin/tclsh
+set JUNIT_JAR = /usr/share/java/junit.jar
+set CORE_HOME = `pwd`
+EOF
+cat > build_private.properties <<EOF
+javacc.home=%{_javadir}
+libs.junit.classpath=%{_javadir}/junit.jar
+EOF
+
+#Build libcore.so
+gcc $RPM_OPT_FLAGS -D_GNU_SOURCE -fPIC -c %SOURCE10 -o libcore.o
+gcc $RPM_OPT_FLAGS -shared -o libcore.so libcore.o -lpthread
 export SGE_INPUT_CFLAGS="$RPM_OPT_FLAGS"
 touch aimk
 ./aimk -only-depend
@@ -190,20 +207,18 @@
 # set up the target installation directory
 export SGE_ROOT=$RPM_BUILD_ROOT%{_datadir}/gridengine
 mkdir -p $SGE_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/qmaster
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/spooldb
 cd source
 echo 'y'| scripts/distinst -nobdb -noopenssl -local -allall -noexit ${gearch}
 install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/gridengine
 install -p -m755 `scripts/compilearch -c ${gearch}`/qevent $RPM_BUILD_ROOT%{_datadir}/gridengine/bin
 
 # man - do before the alternatives rename below
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}
-mv $RPM_BUILD_ROOT/%{_datadir}/gridengine/man/man* $RPM_BUILD_ROOT/%{_mandir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}
+mv $RPM_BUILD_ROOT%{_datadir}/gridengine/man/man* $RPM_BUILD_ROOT%{_mandir}
 
 # Move things to the right location, making links back
 # bin
-mv $RPM_BUILD_ROOT/%{_datadir}/gridengine/bin $RPM_BUILD_ROOT/%{_prefix}
+mv $RPM_BUILD_ROOT%{_datadir}/gridengine/bin $RPM_BUILD_ROOT%{_prefix}
 rmdir $RPM_BUILD_ROOT%{_bindir}/${gearch}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gridengine/bin/${gearch}
 # move qmake out of %{_bindir} to avoid conflicts with Qt qmake
@@ -241,33 +256,48 @@
       $RPM_BUILD_ROOT%{_datadir}/gridengine/utilbin/
 
 # lib
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}
-mv $RPM_BUILD_ROOT/%{_datadir}/gridengine/lib $RPM_BUILD_ROOT/%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_prefix}
+mv $RPM_BUILD_ROOT%{_datadir}/gridengine/lib $RPM_BUILD_ROOT%{_libdir}
+# libcore.so
+install -p -m755 libcore.so $RPM_BUILD_ROOT%{_libdir}
+# Move the JNI libraries
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
+for jni in jgdi juti
+do
+  mv $RPM_BUILD_ROOT%{_libdir}/${jni}.jar $RPM_BUILD_ROOT%{_libdir}/lib${jni}.so \
+     $RPM_BUILD_ROOT%{_libdir}/%{name}/
+done
+mkdir -p $RPM_BUILD_ROOT%{_javadir}
+mv $RPM_BUILD_ROOT%{_libdir}/drmaa.jar $RPM_BUILD_ROOT%{_javadir}/drmaa.jar
 
 # include
-mv $RPM_BUILD_ROOT/%{_datadir}/gridengine/include $RPM_BUILD_ROOT/%{_includedir}
+mv $RPM_BUILD_ROOT%{_datadir}/gridengine/include $RPM_BUILD_ROOT%{_includedir}
 
 # app-defaults
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
-mv $RPM_BUILD_ROOT/%{_datadir}/gridengine/qmon/*.ad \
+mv $RPM_BUILD_ROOT%{_datadir}/gridengine/qmon/*.ad \
    $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults
 
 # The default cell directories
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gridengine/default/common
 
+# The default qmaster, spool, and spooldb directories
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/qmaster
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/spool/{admin_hosts,cqueues,job_scripts,resource_quotas,zombies,calendars,exec_hosts,pe,submit_hosts,centry,hostgroups,projects,users,ckpt,jobs,qinstances,usersets}
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/spooldb
+
 # Bootstrap file
 #cp %SOURCE7 $RPM_BUILD_ROOT%{_datadir}/gridengine/default/common/
 
 # These files get created during user setup (install_qmaster)
-touch $RPM_BUILD_ROOT%{_datadir}/gridengine/default/common/act_qmaster
-touch $RPM_BUILD_ROOT%{_datadir}/gridengine/default/common/bootstrap
-touch $RPM_BUILD_ROOT%{_datadir}/gridengine/default/common/qtask
-touch $RPM_BUILD_ROOT%{_datadir}/gridengine/default/common/settings.csh
-touch $RPM_BUILD_ROOT%{_datadir}/gridengine/default/common/settings.sh
-touch $RPM_BUILD_ROOT%{_datadir}/gridengine/default/common/sge_aliases
-touch $RPM_BUILD_ROOT%{_datadir}/gridengine/default/common/sgeexecd
-touch $RPM_BUILD_ROOT%{_datadir}/gridengine/default/common/sgemaster
-touch $RPM_BUILD_ROOT%{_datadir}/gridengine/default/common/sge_request
+for f in common/{act_qmaster,bootstrap,qtask,settings.csh,settings.sh,sge_aliases,sgeexecd,sgemaster,sge_request}
+do
+   touch $RPM_BUILD_ROOT%{_datadir}/gridengine/default/${f}
+done
+for f in qmaster/job_scripts spooldb/{__db.00{1,2,3,4,5,6},log.0000000001,sge,sge_job}
+do
+   touch $RPM_BUILD_ROOT%{_localstatedir}/spool/gridengine/default/${f}
+done
 
 # Environment (SGE_ROOT)
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/
@@ -280,10 +310,10 @@
 install -p -m644 %SOURCE9 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gridengine
 
 # Don't package catman files
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/gridengine/catman
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/catman
 
 # Rename some man pages to avoid conflicts
-pushd $RPM_BUILD_ROOT/%{_mandir}/man5
+pushd $RPM_BUILD_ROOT%{_mandir}/man5
 for f in *
 do
    if [ ${f:0:4} != sge_ ]
@@ -294,15 +324,15 @@
 popd
 
 #Don't need these
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/gridengine/3rd_party
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/gridengine/dtrace
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/3rd_party
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/dtrace
 
 #Don't ship example binaries
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/gridengine/examples/jobsbin
-rm -rf $RPM_BUILD_ROOT/%{_datadir}/gridengine/examples/worker.*
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/examples/jobsbin
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gridengine/examples/worker.*
 
 #Cleanup some patch backups that get shipped
-rm $RPM_BUILD_ROOT/%{_datadir}/gridengine/util/install_modules/inst_*.sh.*
+rm $RPM_BUILD_ROOT%{_datadir}/gridengine/util/install_modules/inst_*.sh.*
 
 
 %clean
@@ -377,7 +407,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Licenses
+%doc Licenses README
 %config(noreplace) %{_sysconfdir}/profile.d/sge.*
 %config(noreplace) %{_sysconfdir}/sysconfig/gridengine
 %{_bindir}/*
@@ -385,14 +415,12 @@
 %exclude %{_bindir}/qmon
 %exclude %{_bindir}/sge_execd
 %exclude %{_bindir}/sge_qmaster
-%exclude %{_bindir}/sge_schedd
+%{_libdir}/%{name}
+%{_libdir}/libcore.so
 %{_libdir}/libdrmaa.so.*
 %{_libdir}/libspoolb.so
 %{_libdir}/libspoolc.so
-%{_libdir}/jgdi.jar
-%{_libdir}/juti.jar
-%{_libdir}/libjgdi.so
-%{_libdir}/libjuti.so
+%{_javadir}/drmaa.jar
 # Only the file %{_libexecdir}/gridengine/bin/*/qmake is
 # under GPLv2+
 # Olny the file %{_libexecdir}/gridengine/bin/*/qtcsh is
@@ -404,11 +432,8 @@
 %exclude %{_datadir}/gridengine/bin/*/qmon
 %exclude %{_datadir}/gridengine/bin/*/sge_execd
 %exclude %{_datadir}/gridengine/bin/*/sge_qmaster
-%exclude %{_datadir}/gridengine/bin/*/sge_schedd
 %{_datadir}/gridengine/ckpt
-%attr(-,%username,%username) %dir %{_datadir}/gridengine/default
-%attr(-,%username,%username) %dir %{_datadir}/gridengine/default/common
-%attr(-,%username,%username) %ghost %{_datadir}/gridengine/default/common/*
+%attr(-,%username,%username) %ghost %{_datadir}/gridengine/default
 %{_datadir}/gridengine/doc
 %{_datadir}/gridengine/inst_sge
 %{_datadir}/gridengine/mpi
@@ -425,7 +450,6 @@
 %{_mandir}/man5/*.5*
 %{_mandir}/man8/*.8*
 %exclude %{_mandir}/man8/sge_qmaster.8*
-%exclude %{_mandir}/man8/sge_schedd.8*
 %exclude %{_mandir}/man8/sge_execd.8*
 %attr(-,%username,%username) %dir %{_localstatedir}/spool/gridengine
 %attr(-,%username,%username) %dir %{_localstatedir}/spool/gridengine/default
@@ -460,19 +484,35 @@
 %{_initrddir}/sgemaster
 %{_bindir}/qacct
 %{_bindir}/sge_qmaster
-%{_bindir}/sge_schedd
 %{_datadir}/gridengine/bin/*/qacct
 %{_datadir}/gridengine/bin/*/sge_qmaster
-%{_datadir}/gridengine/bin/*/sge_schedd
 %{_datadir}/gridengine/install_qmaster
 %{_datadir}/gridengine/utilbin/db_*
 %{_mandir}/man8/sge_qmaster.8*
-%{_mandir}/man8/sge_schedd.8*
 %attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/qmaster
+%attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/spool
 %attr(-,%username,%username) %ghost %{_localstatedir}/spool/gridengine/default/spooldb
 
 
 %changelog
+* Mon Aug 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-1
+- Update to 6.2 final
+
+* Tue Jul 15 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2beta2-0.1
+- Provide some installation instructions for these RPMs
+- Fix up some installation script issues
+- Ghost more directories created later
+
+* Thu Jun 5 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2beta-0
+- Update to 6.2beta
+- Use aimk.private and build_private.properties instead of patching
+  aimk and build.properties
+- Cleanup some extra /s in paths
+- Shift to Java 1.6.0 because of new requirements in the source
+- Move Java JNI libraries to proper location
+- Drop several upstreamed patches
+- Add patch to avoid linking unneeded libraries
+
 * Fri Apr 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.1u4-1
 - Update to 6.1u4
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	7 May 2008 03:27:55 -0000	1.3
+++ sources	11 Aug 2008 16:41:50 -0000	1.4
@@ -1,3 +1,2 @@
-a0e8ff817ac79f1ad76aa7e100b3cd9c  ge-V61u3_TAG-src.tar.gz
+36e47fba0454d25e4126324384cec221  ge-V62_TAG-src.tar.gz
 a03b0663e8a8912d67adf281c5c49eb4  gridengine-ppc.tar.gz
-d47aee70a978ab59e6a74c3e96c47dd8  ge-V61u4_TAG-src.tar.gz


--- aimk.site.lib.patch DELETED ---


--- distinst.site.patch DELETED ---


--- gridengine-6.0u8-buffer.patch DELETED ---


--- gridengine-6.0u8-lesstif.patch DELETED ---


--- gridengine-6.1pre-depend.patch DELETED ---


--- gridengine-6.1u2-java.patch DELETED ---


--- gridengine-6.1u2-ppc.patch DELETED ---


--- gridengine-6.1u2-qstat-xml.patch DELETED ---


--- gridengine-6.1u2-x86_64.patch DELETED ---


--- gridengine-6.1u3-csh.patch DELETED ---


--- gridengine-6.1u3-libs.patch DELETED ---


--- gridengine-6.1u3-open.patch DELETED ---


--- gridengine-6.1u4-execd.patch DELETED ---


--- gridengine-6.1u4-qmon.patch DELETED ---


--- gridengine-6.1u4-rctemplates.patch DELETED ---


--- qtcsh.sh.h.patch DELETED ---


