fix up some bugs we think we've got a few more fixed.

This commit is contained in:
David Brown 2015-06-06 20:29:28 -07:00
parent 564d92cf35
commit d4f23964d9

View File

@ -71,7 +71,7 @@
Name: torque
Version: 4.2.10
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz
Source2: xpbs.desktop
@ -106,6 +106,7 @@ BuildRequires: readline-devel
BuildRequires: ncurses-devel
BuildRequires: gperf
BuildRequires: openssl-devel
BuildRequires: hwloc-devel
BuildRequires: libxml2-devel
BuildRequires: munge-devel
%if %{use_tcl}
@ -146,6 +147,7 @@ BuildRequires: tetex-latex
%endif
%endif
Requires: munge
Requires(post): /bin/grep /etc/services /bin/cat
%description
@ -162,10 +164,8 @@ This package holds just a few shared files and directories.
Group: Applications/System
Summary: Client part of TORQUE
Requires: %{name}-libs = %{version}-%{release}
Requires: munge
Requires(posttrans): chkconfig
Requires(preun): chkconfig
Requires: munge
%description client
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
@ -377,6 +377,7 @@ CFLAGS="%{optflags} -DUSE_INTERP_RESULT -DUSE_INTERP_ERRORLINE"
--with-sendmail=%{_sbindir}/sendmail --disable-static \
--with-tcp-retry-limit=2 --without-debug \
--enable-drmaa --enable-munge-auth --with-munge \
--enable-cpuset \
%{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}
make %{?_smp_mflags}
@ -633,6 +634,12 @@ fi
%config(noreplace) %{_sysconfdir}/torque/pbs_environment
%config(noreplace) %{_sysconfdir}/torque/server_name
%{_mandir}/man1/pbs.1.*
%attr(0755, root, root) %{_sbindir}/trqauthd
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
%{_unitdir}/trqauthd.service
%else
%{_initrddir}/trqauthd
%endif
%files client
%defattr(-, root, root, -)
@ -823,14 +830,11 @@ fi
%defattr(-, root, root, -)
%attr(0755, root, root) %{_sbindir}/pbs_server
%attr(0755, root, root) %{_sbindir}/momctl
%attr(0755, root, root) %{_sbindir}/trqauthd
%{_sbindir}/qserverd
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
%{_unitdir}/pbs_server.service
%{_unitdir}/trqauthd.service
%else
%{_initrddir}/pbs_server
%{_initrddir}/trqauthd
%endif
%dir %{_var}/log/torque/server_logs
%{torquehomedir}/server_logs
@ -873,6 +877,11 @@ fi
%endif
%changelog
* Sat Jun 6 2015 David Brown <david.brown@pnnl.gov> - 4.2.10-4
- Bugfix - #1227003 test system in cluster environment
- Bugfix - #1216049 add --enable-cpuset and hwloc
- Bugfix - #1176080 this maybe a duplicate of #1216037
* Tue May 19 2015 David Brown <david.brown@pnnl.gov> - 4.2.10-3
- Bugfix - #1215207 create/install service files for these
- Bugfix - #1117263 qmgr aborts in some instances