Merge branch 'master' into f23

Conflicts:
	torque.spec

torque.spec

@@ -71,7 +71,7 @@
 
 Name:        torque
 Version:     4.2.10
-Release:     7%{?dist}
+Release:     8%{?dist}
 Summary:     Tera-scale Open-source Resource and QUEue manager
 Source0:     http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz
 Source2:     xpbs.desktop
@@ -652,7 +652,6 @@ fi
 %{_bindir}/printserverdb
 %{_bindir}/printtracking
 %{_bindir}/tracejob
-%{_sbindir}/momctl
 %{_sbindir}/pbs_demux
 %if %{use_tcl}
 %{_bindir}/pbs_tclsh
@@ -776,6 +775,7 @@ fi
 
 %files mom
 %defattr(-, root, root, -)
+%{_sbindir}/momctl
 %{_sbindir}/pbs_mom
 %{_sbindir}/qnoded
 %{_sbindir}/pbs_demux
@@ -827,7 +827,6 @@ fi
 %files server
 %defattr(-, root, root, -)
 %attr(0755, root, root) %{_sbindir}/pbs_server
-%attr(0755, root, root) %{_sbindir}/momctl
 %{_sbindir}/qserverd
 %if 0%{?rhel} >= 7 || 0%{?fedora} > 0
 %{_unitdir}/pbs_server.service
@@ -875,10 +874,13 @@ fi
 %endif
 
 %changelog
+* Sun Dec 06 2015 David Brown <david.brown@pnnl.gov> - 4.2.10-8
+- Resolve momctl into the right package
+
 * Fri Sep 18 2015 Richard Hughes <rhughes@redhat.com> - 4.2.10-7
 - Remove AppStream metadata file as it's no longer used.
 
-* Mon Aug 17 2015 Fedora Release Engineering <david.brown@pnnl.gov> - 4.2.10-6
+* Mon Aug 17 2015 David Brown <david.brown@pnnl.gov> - 4.2.10-6
 - enable numa support bug #1231148
 
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.10-5