rpms/gridengine/devel gridengine-6.1u3-csh.patch, NONE, 1.1 gridengine.spec, 1.1, 1.2

[Orion Poplawski (orion)]

Author: orion

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

Modified Files:
	gridengine.spec 
Added Files:
	gridengine-6.1u3-csh.patch 
Log Message:
* Tue Apr 1 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.1u3-7
- Use alternatives to avoid conflicts with torque (bug #437613)
- Add patch to support stricter csh variable handling


gridengine-6.1u3-csh.patch:

--- NEW FILE gridengine-6.1u3-csh.patch ---
--- gridengine/source/aimk.argv	2008-04-01 11:20:27.000000000 -0600
+++ gridengine/source/aimk	2008-04-01 11:30:20.000000000 -0600
@@ -812,7 +812,11 @@
       continue
       breaksw
    endsw
-   set argv     = ($argv[2-])
+   if ($#argv > 1 ) then
+      set argv     = ($argv[2-])
+   else
+      set argv     = ""
+   endif
 end
 
 if ( $DEBUGGED && $USE_QMAKE ) then


Index: gridengine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gridengine/devel/gridengine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gridengine.spec	8 Feb 2008 21:57:24 -0000	1.1
+++ gridengine.spec	1 Apr 2008 17:47:03 -0000	1.2
@@ -6,7 +6,7 @@
 
 Name:    gridengine
 Version: 6.1u3
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Grid Engine - Distributed Computing Management software
 
 Group:   Applications/System
@@ -47,6 +47,7 @@
 Patch23: gridengine-6.1u3-rctemplates.patch
 Patch24: gridengine-6.1u3-perm.patch
 Patch25: gridengine-6.1u3-libs.patch
+Patch26: gridengine-6.1u3-csh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: /bin/csh, openssl-devel, db4-devel, ncurses-devel, pam-devel
@@ -54,6 +55,8 @@
 BuildRequires: java-devel, ant-junit, javacc, ant-nodeps
 BuildRequires: elfutils-libelf-devel, net-tools
 BuildRequires: fedora-usermgmt-devel
+Requires(posttrans): /usr/sbin/alternatives
+Requires(preun): /usr/sbin/alternatives
 %{?FE_USERADD_REQ}
 
 
@@ -154,6 +157,7 @@
 %patch23 -p1 -b .rctemplates
 %patch24 -p1 -b .perm
 %patch25 -p1 -b .libs
+%patch26 -p1 -b .csh
 sed -i.arch -e 's,/\$DSTARCH,,g' source/scripts/distinst
 #Don't ship rctemplates
 rm -rf source/dist/util/rctemplates
@@ -195,6 +199,10 @@
 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}
+
 # Move things to the right location, making links back
 # bin
 mv $RPM_BUILD_ROOT/%{_datadir}/gridengine/bin $RPM_BUILD_ROOT/%{_prefix}
@@ -205,10 +213,23 @@
 mv $RPM_BUILD_ROOT%{_bindir}/qmake $RPM_BUILD_ROOT%{_libexecdir}/gridengine/bin/${gearch}/
 ln -s ../../../../libexec/gridengine/bin/${gearch}/qmake \
       $RPM_BUILD_ROOT%{_datadir}/gridengine/bin/${gearch}/
+# Rename common queuing binaries and manpages for use with alternatives
+for bin in qalter qdel qhold qrls qselect qstat qsub
+do
+    if [ -L $RPM_BUILD_ROOT%{_bindir}/$bin ]
+    then
+        target=`readlink $RPM_BUILD_ROOT%{_bindir}/$bin`
+        rm $RPM_BUILD_ROOT%{_bindir}/$bin
+        ln -s ${target}-ge $RPM_BUILD_ROOT%{_bindir}/${bin}-ge
+    else
+        mv $RPM_BUILD_ROOT%{_bindir}/$bin $RPM_BUILD_ROOT%{_bindir}/${bin}-ge
+    fi
+    mv $RPM_BUILD_ROOT%{_mandir}/man1/${bin}.1 $RPM_BUILD_ROOT%{_mandir}/man1/${bin}-ge.1
+done
 for bin in `find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l`
 do
     ln -s ../../../../bin/`basename $bin` \
-          $RPM_BUILD_ROOT%{_datadir}/gridengine/bin/${gearch}/
+          $RPM_BUILD_ROOT%{_datadir}/gridengine/bin/${gearch}/`basename $bin -ge`
 done
 
 # utilbin
@@ -225,10 +246,6 @@
 mkdir -p $RPM_BUILD_ROOT/%{_prefix}
 mv $RPM_BUILD_ROOT/%{_datadir}/gridengine/lib $RPM_BUILD_ROOT/%{_libdir}
 
-# man
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}
-mv $RPM_BUILD_ROOT/%{_datadir}/gridengine/man/man* $RPM_BUILD_ROOT/%{_mandir}
-
 # include
 mv $RPM_BUILD_ROOT/%{_datadir}/gridengine/include $RPM_BUILD_ROOT/%{_includedir}
 
@@ -301,6 +318,32 @@
 
 %post -p /sbin/ldconfig
 
+%posttrans
+alternatives --install %{_bindir}/qsub qsub %{_bindir}/qsub-ge 10 \
+        --slave %{_mandir}/man1/qsub.1.gz qsub-man \
+                %{_mandir}/man1/qsub-ge.1.gz \
+        --slave %{_bindir}/qalter qalter %{_bindir}/qalter-ge \
+        --slave %{_mandir}/man1/qalter.1.gz qalter-man \
+                %{_mandir}/man1/qalter-ge.1.gz \
+        --slave %{_bindir}/qdel qdel %{_bindir}/qdel-ge \
+        --slave %{_mandir}/man1/qdel.1.gz qdel-man \
+                %{_mandir}/man1/qdel-ge.1.gz \
+        --slave %{_bindir}/qhold qhold %{_bindir}/qhold-ge \
+        --slave %{_mandir}/man1/qhold.1.gz qhold-man \
+                %{_mandir}/man1/qhold-ge.1.gz \
+        --slave %{_bindir}/qrls qrls %{_bindir}/qrls-ge \
+        --slave %{_mandir}/man1/qrls.1.gz qrls-man \
+                %{_mandir}/man1/qrls-ge.1.gz \
+        --slave %{_bindir}/qselect qselect %{_bindir}/qselect-ge \
+        --slave %{_mandir}/man1/qselect.1.gz qselect-man \
+                %{_mandir}/man1/qselect-ge.1.gz \
+        --slave %{_bindir}/qstat qstat %{_bindir}/qstat-ge \
+        --slave %{_mandir}/man1/qstat.1.gz qstat-man \
+                %{_mandir}/man1/qstat-ge.1.gz
+
+%preun
+alternatives --remove qsub %{_bindir}/qsub-ge
+
 %postun -p /sbin/ldconfig
 
 
@@ -432,6 +475,10 @@
 
 
 %changelog
+* Tue Apr 1 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.1u3-7
+- Use alternatives to avoid conflicts with torque (bug #437613)
+- Add patch to support stricter csh variable handling
+
 * Fri Feb  8 2008 - Orion Poplawski <orion at cora.nwra.com> - 6.1u3-6
 - Fixup subpackage License tags
 - Service name change in scriptlets