dmlb2000 pushed to torque (master). "Merge branch 'master' into el6 (..more)"

[notifications at fedoraproject.org]

>From 13a37e1cb58b7b89bbb359f04070f9301f001cfb Mon Sep 17 00:00:00 2001
From: David Brown <dmlb2000 at gmail.com>
Date: Mon, 6 Apr 2015 18:55:39 -0700
Subject: updated upstream source


diff --git a/.gitignore b/.gitignore
index 581d76a..982fe8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,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 d7e07c5..d1ca055 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:     2%{?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
@@ -808,6 +808,9 @@ fi
 %endif
 
 %changelog
+* Mon Apr 6 2015 David Brown <david.brown at pnnl.gov> - 4.2.10-1
+- Updated upstream version
+
 * Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 4.2.8-2
 - Add an AppData file for the software center
 
-- 
cgit v0.10.2


>From e23e1e70273d9c9727eb81b1fc84a4516adb19b3 Mon Sep 17 00:00:00 2001
From: David Brown <dmlb2000 at gmail.com>
Date: Tue, 7 Apr 2015 20:52:34 -0700
Subject: this works except for doxygen produces bad latex
 https://bugzilla.gnome.org/show_bug.cgi?id=742427


diff --git a/torque.spec b/torque.spec
index d1ca055..fcf5121 100644
--- a/torque.spec
+++ b/torque.spec
@@ -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)
@@ -358,7 +360,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}
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/torque.git/commit/?h=master&id=f33e61098fd46443489b0c8445f7de5fc44fa7e2