Merge branch 'master' into el6

Conflicts:
	torque.spec

.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

sources

@@ -1 +1,2 @@
 3dd4348f54ba236ee7c208cc6b97f674  torque-4.2.8.tar.gz
+541f58ab46166e86d7a468500be3fa4d  torque-4.2.10.tar.gz

torque.spec

@@ -70,8 +70,8 @@
 %global server_nameflags --with-default-server=%{server_name}
 
 Name:        torque
-Version:     4.2.8
+Version:     4.2.10
-Release:     3%{?dist}
+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 <david.brown@pnnl.gov> - 4.2.10-1
+- Updated upstream version
+
 * Thu Apr 2 2015 David Brown <david.brown@pnnl.gov> - 4.2.8-3
 - Version bump to merge from previous version