Merge branch 'master' into f23

This commit is contained in:
David Brown 2016-02-19 21:12:03 -08:00
commit 7fc16d9f5e

View File

@ -71,7 +71,7 @@
Name: torque
Version: 4.2.10
Release: 8%{?dist}
Release: 9%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz
Source2: xpbs.desktop
@ -129,6 +129,9 @@ BuildRequires: doxygen
%if "%{?rhel}" == "5"
BuildRequires: graphviz-gd
%endif
%if %{?fedora}%{!?fedora:0} >= 24
BuildRequires: texlive-tabu
%endif
%if %{?fedora}%{!?fedora:0} >= 9 || %{?rhel}%{!?rhel:0} >= 7
BuildRequires: tex(latex)
BuildRequires: tex-xtab
@ -874,6 +877,12 @@ fi
%endif
%changelog
* Fri Feb 19 2016 David Brown <david.brown@pnnl.gov> - 4.2.10-9
- Resolve dependencies for rawhide (#1308192)
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.10-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Sun Dec 06 2015 David Brown <david.brown@pnnl.gov> - 4.2.10-8
- Resolve momctl into the right package