- Enable drmaa support and add drmaa sub packages.

torque.spec

@@ -68,7 +68,7 @@
 
 Name:        torque
 Version:     2.5.3
-Release:     2%{?dist}
+Release:     3%{?dist}
 Summary:     Tera-scale Open-source Resource and QUEue manager
 Source0:     http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
 Source2:     xpbs.desktop
@@ -87,6 +87,9 @@ Patch2:      torque-start-start.patch
 License:     OpenPBS
 Group:       System Environment/Daemons
 URL:         http://www.clusterresources.com/products/torque/
+%if 0%{?el4}%{?el5}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%endif
 BuildRequires: desktop-file-utils
 BuildRequires: pam-devel
 BuildRequires: xauth
@@ -99,6 +102,30 @@ BuildRequires: tcl-devel
 BuildRequires: tk-devel
 %endif
 
+#doxygen appears to be broken in rawhide at the moment
+#Dec 9th 2010 so don't build the drmaa documentation
+#for now.
+%if ! 0%{?fc15}
+%global doxydoc 1
+%endif
+
+%if 0%{?doxydoc}
+BuildRequires:  graphviz
+BuildRequires:  doxygen
+%if "%{?rhel}" == "5"
+BuildRequires: graphviz-gd
+%endif
+%if %{?fedora}%{!?fedora:0} >= 9
+BuildRequires:  tex(latex)
+%else
+%if %{?rhel}%{!?rhel:0} >= 6
+BuildRequires:  tex(latex)
+%else
+BuildRequires:  tetex-latex
+%endif
+%endif
+%endif
+
 %description
 TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource 
 manager providing control over batch jobs and distributed compute nodes.
@@ -270,6 +297,41 @@ other leading edge HPC organizations.
 
 This package holds the server.
 
+%package drmaa
+Group:             System Environment/Daemons
+Summary:           Runtime files for the drmaa interface.
+Requires:          torque-libs = %{version}-%{release}
+
+%description drmaa
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource 
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
+Runtime files for working the DRMAA interface to torque.
+DRMAA is "Distributed Resource Management Application API"
+
+
+%package drmaa-devel
+Group:             System Environment/Daemons
+Summary:           Development files for the drmaa interface.
+Requires:          torque-drmaa = %{version}-%{release}
+Requires:          torque-devel = %{version}-%{release}
+
+%description drmaa-devel
+TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource 
+manager providing control over batch jobs and distributed compute nodes.
+TORQUE is based on OpenPBS version 2.3.12 and incorporates scalability,
+fault tolerance, and feature extension patches provided by USC, NCSA, OSC,
+the U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many
+other leading edge HPC organizations.
+
+Developement files for working the DRMAA interface to torque.
+DRMAA is "Distributed Resource Management Application API"
+
+
 %prep
 %setup -q
 %patch0 -p1
@@ -285,6 +347,7 @@ CFLAGS="%{optflags} -Wno-overlength-strings"
 %configure --includedir=%{_includedir}/torque \
   --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \
   --with-sendmail=%{_sbindir}/sendmail --disable-static \
+  --enable-drmaa \
   %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
 
 
@@ -378,6 +441,17 @@ ln -s %{_var}/log/torque/server_logs .
 popd
 
 
+# Move drmaa man pages to correct place 
+# and delete the three copies of the same documentation.
+
+%if 0%{?doxydoc}
+mv %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/* %{buildroot}%{_mandir}/man3/.
+rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/html/*
+rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/latex/*
+# Include drmaa.pdf later from the src tree.
+rm %{buildroot}%{_defaultdocdir}/torque-drmaa/drmaa.pdf
+%endif
+
 %clean
 rm -rf %{buildroot}
 
@@ -428,6 +502,9 @@ fi
 
 %post   libs  -p /sbin/ldconfig
 %postun libs  -p /sbin/ldconfig
+%post   drmaa -p /sbin/ldconfig
+%postun drmaa -p /sbin/ldconfig
+
 
 %post mom
 /sbin/chkconfig --add pbs_mom
@@ -500,6 +577,7 @@ fi
 %files docs
 %defattr(-, root, root, -)
 %doc doc/admin_guide.ps
+%doc src/drmaa/drmaa.pdf
 %{_mandir}/man1/basl2c.1.*
 %{_mandir}/man1/nqs2pbs.1.*
 %{_mandir}/man1/pbs.1.*
@@ -597,12 +675,19 @@ fi
 
 %files libs
 %defattr(-, root, root, -)
-%{_libdir}/*.so.*
+%{_libdir}/libtorque.so.*
 
 %files devel
 %defattr(-, root, root, -)
-%{_libdir}/*.so
+%{_libdir}/libtorque.so
-%{_includedir}/torque
+%{_includedir}/torque/pbs_error.h
+%{_includedir}/torque/pbs_error_db.h
+%{_includedir}/torque/pbs_ifl.h
+%{_includedir}/torque/rm.h
+%{_includedir}/torque/rpp.h
+%{_includedir}/torque/tm.h
+%{_includedir}/torque/tm_.h
+
 %{_bindir}/pbs-config
 
 %files mom
@@ -654,8 +739,43 @@ fi
 %{torquehomedir}/server_logs
 %{torquehomedir}/server_priv
 
+%files drmaa
+%defattr(-, root, root, -)
+%{_libdir}/libdrmaa.so.*
+
+%files drmaa-devel
+%defattr(-, root, root, -)
+%{_libdir}/libdrmaa.so
+%{_includedir}/torque/drmaa.h
+%if 0%{?doxydoc}
+%{_mandir}/man3/compat.h.3.*
+%{_mandir}/man3/drmaa.3.*
+%{_mandir}/man3/drmaa.h.3.*
+%{_mandir}/man3/drmaa_attr_names_s.3.*
+%{_mandir}/man3/drmaa_attr_values_s.3.*
+%{_mandir}/man3/drmaa_attrib.3.*
+%{_mandir}/man3/drmaa_attrib_info_s.3.*
+%{_mandir}/man3/drmaa_def_attr_s.3.*
+%{_mandir}/man3/drmaa_job_ids_s.3.*
+%{_mandir}/man3/drmaa_job_iter_s.3.*
+%{_mandir}/man3/drmaa_job_s.3.*
+%{_mandir}/man3/drmaa_job_template_s.3.*
+%{_mandir}/man3/drmaa_jobt.3.*
+%{_mandir}/man3/drmaa_session.3.*
+%{_mandir}/man3/drmaa_session_s.3.*
+%{_mandir}/man3/drmaa_submission_context_s.3.*
+%{_mandir}/man3/drmaa_viter.3.*
+%{_mandir}/man3/error.h.3.*
+%{_mandir}/man3/jobs.3.*
+%{_mandir}/man3/jobs.h.3.*
+%{_mandir}/man3/lookup3.h.3.*
+%{_mandir}/man3/pbs_attrib.3.*
+%endif
 
 %changelog
+* Wed Dec 8 2010 Steve Traylen <steve.traylen@cern.ch> - 2.5.3-3
+- Enable drmaa support and add drmaa sub packages.
+
 * Wed Dec 8 2010 Steve Traylen <steve.traylen@cern.ch> - 2.5.3-2
 - Only build noarch doc package on RHEL6 or Fedora10. #659723