From a7e63a0384887b1e6d3d1f9c93b6c60512c0e928 Mon Sep 17 00:00:00 2001 From: stevetraylen Date: Mon, 10 May 2010 10:50:40 +0000 Subject: [PATCH] Hand branch EL5 into EL6. --- sources | 2 +- torque-2.1.10-NI_MAXSERV.patch | 14 ---------- torque.spec | 50 +++++++++++++++++++++++----------- 3 files changed, 35 insertions(+), 31 deletions(-) delete mode 100644 torque-2.1.10-NI_MAXSERV.patch diff --git a/sources b/sources index 01baf2e..06832f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -298e0ff61028efc74f050425aac79300 torque-2.1.10.tar.gz +30d3366432ad3506278f884ba797e2b2 torque-2.3.10.tar.gz diff --git a/torque-2.1.10-NI_MAXSERV.patch b/torque-2.1.10-NI_MAXSERV.patch deleted file mode 100644 index a6df41f..0000000 --- a/torque-2.1.10-NI_MAXSERV.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -pruN torque-2.1.10_orig/src/include/port_forwarding.h torque-2.1.10/src/include/port_forwarding.h ---- torque-2.1.10_orig/src/include/port_forwarding.h 2006-10-13 11:25:37.000000000 -0700 -+++ torque-2.1.10/src/include/port_forwarding.h 2008-02-14 13:08:05.000000000 -0800 -@@ -16,6 +16,10 @@ - # endif - #endif /* X_UNIX_PATH */ - -+#ifndef NI_MAXSERV -+# define NI_MAXSERV 32 -+#endif /* !NI_MAXSERV */ -+ - - struct pfwdsock { - int sock; diff --git a/torque.spec b/torque.spec index 9b73fba..4ab6002 100644 --- a/torque.spec +++ b/torque.spec @@ -1,9 +1,9 @@ # comment out snap if building a real release %define name torque -%define version 2.1.10 +%define version 2.3.10 #%%define snap 200604251602 -%define release 8 +%define release 1 # The following options are supported: # --with server_name=hostname @@ -103,8 +103,6 @@ Requires(preun): /usr/sbin/alternatives Conflicts: pbspro, openpbs, openpbs-oscar Obsoletes: torque-localhost -Patch0: torque-2.1.10-NI_MAXSERV.patch - %if %use_tcl BuildRequires: tcl-devel %endif @@ -124,13 +122,13 @@ This package holds just a few shared files and directories. %prep %setup -q -n torque-%{version}%{?snap:-snap.%snap} -%patch0 -p1 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} . %build -%configure --includedir=%{_includedir}/torque \ +%configure --disable-gcc-warnings \ + --includedir=%{_includedir}/torque \ --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \ --with-sendmail=/usr/sbin/sendmail \ %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags} @@ -197,16 +195,16 @@ if %__grep -q "PBS services" /etc/services;then : PBS services already installed else cat<<-__EOF__>>/etc/services - # Standard PBS services - pbs 15001/tcp # pbs server (pbs_server) - pbs 15001/udp # pbs server (pbs_server) - pbs_mom 15002/tcp # mom to/from server - pbs_mom 15002/udp # mom to/from server - pbs_resmom 15003/tcp # mom resource management requests - pbs_resmom 15003/udp # mom resource management requests - pbs_sched 15004/tcp # scheduler - pbs_sched 15004/udp # scheduler - __EOF__ +# Standard PBS services +pbs 15001/tcp # pbs server (pbs_server) +pbs 15001/udp # pbs server (pbs_server) +pbs_mom 15002/tcp # mom to/from server +pbs_mom 15002/udp # mom to/from server +pbs_resmom 15003/tcp # mom resource management requests +pbs_resmom 15003/udp # mom resource management requests +pbs_sched 15004/tcp # scheduler +pbs_sched 15004/udp # scheduler +__EOF__ fi @@ -254,6 +252,7 @@ This package holds the fifo C scheduler. %files scheduler %defattr(-, root, root) %attr(0755, root, root) %{_sbindir}/pbs_sched +%attr(0755, root, root) %{_sbindir}/qschedd %{_initrddir}/pbs_sched %dir %{torquehomedir}/sched_priv %config(noreplace) %{torquehomedir}/sched_priv/* @@ -281,6 +280,7 @@ This package holds the server. %files server %defattr(-, root, root) %attr(0755, root, root) %{_sbindir}/pbs_server +%attr(0755, root, root) %{_sbindir}/qserverd %attr(0755, root, root) %{_sbindir}/momctl %{_initrddir}/pbs_server %{torquehomedir}/server_logs @@ -308,6 +308,8 @@ This package holds the execute daemon required on every node. %files mom %defattr(-, root, root) %attr(0755, root, root) %{_sbindir}/pbs_mom +%attr(0755, root, root) %{_sbindir}/qnoded +%attr(0755, root, root) %{_bindir}/pbs_track %{_initrddir}/pbs_mom %if %{use_rcp} %attr(4755 root root) %{_sbindir}/pbs_rcp @@ -374,6 +376,7 @@ fi %{_bindir}/pbsnodes %{_bindir}/printjob %{_bindir}/printtracking +%{_bindir}/printserverdb %{_bindir}/tracejob %attr(4755 root root) %{_sbindir}/pbs_iff %{_sbindir}/pbs_demux @@ -462,6 +465,21 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job. %changelog +* Fri Feb 12 2010 Steve Traylen - 2.3.10-1 +- New upstream 2.3.10 + +* Tue Jan 19 2010 Steve Traylen - 2.3.9-1 +- New upstream 2.3.9 +* Thu Dec 3 2009 Steve Traylen - 2.3.8-1 +- Updated to upstream 2.3.8 +- First EPEL build. +- Add new commands to package. + /usr/bin/pbs_track + /usr/bin/printserverdb + /usr/sbin/qnoded + /usr/sbin/qschedd + /usr/sbin/qserverd +- Remove torque-2.1.10-NI_MAXSERV.patch as not needed any more. * Sun Jul 26 2009 Fedora Release Engineering - 2.1.10-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild