diff --git a/.gitignore b/.gitignore index 865ea8d..4129a1e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /torque-3.0.4.tar.gz /torque-4.2.6.1.tar.gz /torque-4.2.8.tar.gz +/torque-4.2.10.tar.gz diff --git a/sources b/sources index eafec14..726c75c 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 3dd4348f54ba236ee7c208cc6b97f674 torque-4.2.8.tar.gz +541f58ab46166e86d7a468500be3fa4d torque-4.2.10.tar.gz diff --git a/torque.spec b/torque.spec index 77314cc..8da6b7a 100644 --- a/torque.spec +++ b/torque.spec @@ -70,8 +70,8 @@ %global server_nameflags --with-default-server=%{server_name} Name: torque -Version: 4.2.8 -Release: 3%{?dist} +Version: 4.2.10 +Release: 1%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -103,6 +103,7 @@ BuildRequires: ncurses-devel BuildRequires: gperf BuildRequires: openssl-devel BuildRequires: libxml2-devel +BuildRequires: munge-devel %if %{use_tcl} BuildRequires: tcl-devel %endif @@ -124,6 +125,7 @@ BuildRequires: tex-xtab BuildRequires: tex-sectsty BuildRequires: tex-tocloft BuildRequires: tex-multirow +BuildRequires: tex-adjustbox %else %if %{?rhel}%{!?rhel:0} >= 6 BuildRequires: tex(latex) @@ -361,7 +363,7 @@ CFLAGS="%{optflags} -Wno-overlength-strings -DUSE_INTERP_RESULT -DUSE_INTERP_ERR --with-server-home=%{torquehomedir} --with-pam=/%{_lib}/security \ --with-sendmail=%{_sbindir}/sendmail --disable-static \ --with-tcp-retry-limit=2 --without-debug \ - --enable-drmaa --enable-munge-auth \ + --enable-drmaa --enable-munge-auth --with-munge \ %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags} make %{?_smp_mflags} @@ -813,6 +815,9 @@ fi %endif %changelog +* Mon Apr 6 2015 David Brown - 4.2.10-1 +- Updated upstream version + * Thu Apr 2 2015 David Brown - 4.2.8-3 - Version bump to merge from previous version