rpms/gridengine/devel README, 1.1, 1.2 gridengine-6.2-rctemplates.patch, 1.2, 1.3 gridengine.spec, 1.6, 1.7

Orion Poplawski orion at fedoraproject.org
Tue Nov 11 20:30:14 UTC 2008


Author: orion

Update of /cvs/pkgs/rpms/gridengine/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10158/devel

Modified Files:
	README gridengine-6.2-rctemplates.patch gridengine.spec 
Log Message:
* Tue Nov 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-4
- Add note to README about localhost line in /etc/hosts
- Cleanup setting.sh some, no more MAN stuff
- Add conditional build support for EL



Index: README
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README	11 Aug 2008 16:41:50 -0000	1.1
+++ README	11 Nov 2008 20:29:43 -0000	1.2
@@ -3,12 +3,17 @@
 for a "reduced NFS" install with logs going into the /var/spool/gridengine
 directories on each host.
 
+You probably want to edit /etc/hosts to remove any mentions of the hostname
+on the localhost line, like the following:
+
+127.0.0.1		localhost.localdomain localhost hostname
+
 On the qmaster (and any shadow hosts) install gridengine-qmaster, then:
 
  1)
   cd /usr/share/gridengine
  2)
-   ./install_qmaster 
+   ./install_qmaster [any desired options]
 
 OR
 

gridengine-6.2-rctemplates.patch:

Index: gridengine-6.2-rctemplates.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine-6.2-rctemplates.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gridengine-6.2-rctemplates.patch	11 Nov 2008 17:03:46 -0000	1.2
+++ gridengine-6.2-rctemplates.patch	11 Nov 2008 20:29:43 -0000	1.3
@@ -263,3 +263,86 @@
  fi
  
  exit 0
+--- gridengine/source/dist/util/create_settings.sh.rctemplates	2008-02-08 04:57:29.000000000 -0700
++++ gridengine/source/dist/util/create_settings.sh	2008-11-11 11:04:20.000000000 -0700
+@@ -67,8 +67,6 @@
+ echo "setenv SGE_ROOT $SGE_ROOT"                         >  $SP_CSH
+ echo ""                                                  >> $SP_CSH
+ echo "set ARCH = \`\$SGE_ROOT/util/arch\`"               >> $SP_CSH
+-echo "set DEFAULTMANPATH = \`\$SGE_ROOT/util/arch -m\`"  >> $SP_CSH
+-echo "set MANTYPE = \`\$SGE_ROOT/util/arch -mt\`"        >> $SP_CSH
+ echo ""                                                  >> $SP_CSH
+ 
+ #if [ "$SGE_CELL" != "" -a "$SGE_CELL" != "default" ]; then
+@@ -93,31 +91,9 @@
+ 
+ 
+ echo ""                                                          >> $SP_CSH
+-echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_CSH
+-echo 'if ( $?MANPATH == 1 ) then'                                >> $SP_CSH
+-echo "   setenv MANPATH \$SGE_ROOT/"'${MANTYPE}':'$MANPATH'      >> $SP_CSH
+-echo "else"                                                      >> $SP_CSH
+-echo "   setenv MANPATH \$SGE_ROOT/"'${MANTYPE}:$DEFAULTMANPATH' >> $SP_CSH
+-echo "endif"                                                     >> $SP_CSH
+-echo ""                                                          >> $SP_CSH
+ echo "set path = ( \$SGE_ROOT/bin/"'$ARCH $path )'               >> $SP_CSH
+ 
+-echo 'switch ($ARCH)'                                            >> $SP_CSH
+-#ENFORCE_SHLIBPATH#echo 'case "sol*":'                           >> $SP_CSH
+-#ENFORCE_SHLIBPATH#echo 'case "lx*":'                            >> $SP_CSH
+-#ENFORCE_SHLIBPATH#echo 'case "hp11-64":'                        >> $SP_CSH
+-#ENFORCE_SHLIBPATH#echo '   breaksw'                             >> $SP_CSH
+-echo 'case "*":'                                                 >> $SP_CSH
+-echo "   set shlib_path_name = \`\$SGE_ROOT/util/arch -lib\`"       >> $SP_CSH
+-echo "   if ( \`eval echo '\$?'\$shlib_path_name\` ) then"          >> $SP_CSH
+-echo "      set old_value = \`eval echo '\$'\$shlib_path_name\`"    >> $SP_CSH
+-echo "      setenv \$shlib_path_name \"\$SGE_ROOT/lib/\$ARCH\":\"\$old_value\""   >> $SP_CSH
+-echo "   else"                                                      >> $SP_CSH
+-echo "      setenv \$shlib_path_name \$SGE_ROOT/lib/\$ARCH"         >> $SP_CSH
+-echo "   endif"                                                     >> $SP_CSH
+-echo "   unset shlib_path_name  old_value"                          >> $SP_CSH
+-echo "endsw"                                                        >> $SP_CSH
+-echo "unset ARCH DEFAULTMANPATH MANTYPE"                            >> $SP_CSH
++echo "unset ARCH"                                                   >> $SP_CSH
+ 
+ #
+ # bourne shell settings file
+@@ -126,8 +102,6 @@
+ echo "SGE_ROOT=$SGE_ROOT; export SGE_ROOT"                        > $SP_SH
+ echo ""                                                          >> $SP_SH
+ echo "ARCH=\`\$SGE_ROOT/util/arch\`"                             >> $SP_SH
+-echo "DEFAULTMANPATH=\`\$SGE_ROOT/util/arch -m\`"                >> $SP_SH
+-echo "MANTYPE=\`\$SGE_ROOT/util/arch -mt\`"                      >> $SP_SH
+ echo ""                                                          >> $SP_SH
+ 
+ if [ "$SGE_CELL" != "" ]; then
+@@ -151,28 +125,7 @@
+ 
+ 
+ echo ""                                                          >> $SP_SH
+-echo "if [ \"\$MANPATH\" = \"\" ]; then"                         >> $SP_SH
+-echo "   MANPATH=\$DEFAULTMANPATH"                               >> $SP_SH
+-echo "fi"                                                        >> $SP_SH
+-echo "MANPATH=\$SGE_ROOT/\$MANTYPE:\$MANPATH; export MANPATH"    >> $SP_SH
+-echo ""                                                          >> $SP_SH
+ echo "PATH=\$SGE_ROOT/bin/\$ARCH:\$PATH; export PATH"            >> $SP_SH
+ 
+-echo '# library path setting required only for architectures where RUNPATH is not supported' >> $SP_SH
+-echo 'case $ARCH in'                                                >> $SP_SH
+-#ENFORCE_SHLIBPATH#echo 'sol*|lx*|hp11-64)'                         >> $SP_SH
+-#ENFORCE_SHLIBPATH#echo '   ;;'                                     >> $SP_SH
+-echo '*)'                                                           >> $SP_SH
+-echo "   shlib_path_name=\`\$SGE_ROOT/util/arch -lib\`"             >> $SP_SH
+-echo "   old_value=\`eval echo '\$'\$shlib_path_name\`"             >> $SP_SH
+-echo "   if [ x\$old_value = "x" ]; then"                           >> $SP_SH
+-echo "      eval \$shlib_path_name=\$SGE_ROOT/lib/\$ARCH"           >> $SP_SH
+-echo "   else"                                                      >> $SP_SH
+-echo "      eval \$shlib_path_name=\$SGE_ROOT/lib/\$ARCH:\$old_value" >> $SP_SH
+-echo "   fi"                                                        >> $SP_SH
+-echo "   export \$shlib_path_name"                                  >> $SP_SH
+-echo '   unset shlib_path_name old_value'                           >> $SP_SH
+-echo '   ;;'                                                        >> $SP_SH
+-echo 'esac'                                                         >> $SP_SH
+-echo "unset ARCH DEFAULTMANPATH MANTYPE"                            >> $SP_SH
++echo "unset ARCH"                                                   >> $SP_SH
+ 


Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gridengine.spec	11 Nov 2008 17:03:46 -0000	1.6
+++ gridengine.spec	11 Nov 2008 20:29:43 -0000	1.7
@@ -6,7 +6,7 @@
 
 Name:    gridengine
 Version: 6.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -61,7 +61,12 @@
 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: libXmu-devel, libXpm-devel
+%if 0%{?rhel}
+BuildRequires: openmotif-devel
+%else
+BuildRequires: lesstif-devel
+%endif
 BuildRequires: java-devel >= 1:1.6.0, javacc, ant-junit, ant-nodeps
 BuildRequires: elfutils-libelf-devel, net-tools
 BuildRequires: fedora-usermgmt-devel
@@ -156,7 +161,9 @@
 %patch4 -p1 -b .sge_ca
 %patch5 -p1 -b .jni
 %patch7 -p1 -b .Werror
+%if !0%{?rhel}
 %patch15 -p1 -b .lesstif
+%endif
 %patch19 -p1 -b .auto
 %patch22 -p1 -b .rpath
 %patch25 -p1 -b .libs
@@ -515,6 +522,11 @@
 
 
 %changelog
+* Tue Nov 11 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-4
+- Add note to README about localhost line in /etc/hosts
+- Cleanup setting.sh some, no more MAN stuff
+- Add conditional build support for EL
+
 * Wed Nov 5 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.2-3
 - Add Requires: ncurses for "clear"
 - Add patch from CVS to update install scripts




More information about the fedora-extras-commits mailing list