From 4ed91f1ba87234f0729b50c329a9f15db88fe22e Mon Sep 17 00:00:00 2001 From: David Brown Date: Tue, 14 Oct 2014 23:22:04 -0700 Subject: [PATCH] bumped release --- torque.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/torque.spec b/torque.spec index b3ac9d5..f30add3 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 4.2.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -460,7 +460,7 @@ popd # and delete the three copies of the same documentation. %if 0%{?doxydoc} -rm %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/*_src_drmaa_src_.3 +rm -f %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/*_src_drmaa_src_.3 mv %{buildroot}%{_defaultdocdir}/torque-drmaa/man/man3/* %{buildroot}%{_mandir}/man3/. rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/html/* rm -rf %{buildroot}%{_defaultdocdir}/torque-drmaa/latex/* @@ -796,6 +796,10 @@ fi %endif %changelog +* Tue Oct 14 2014 David Brown - 4.2.8-2 +- merged fedora latest into epel +- This breaks old configs and should be treated carefully + * Mon Sep 01 2014 Haïkel Guémar - 4.2.8-1 - upstream 4.2.8 @@ -903,7 +907,7 @@ fi * Fri Jun 17 2011 Steve Traylen - 3.0.1-3 - Add torque-munge-size.patch, rhbz#713996, Alex Chernyakhovsky -* Wed Jun 11 2011 Steve Traylen - 2.5.5-2 +* Wed Jun 8 2011 Steve Traylen - 2.5.5-2 - Add torque-buffer-overrun.patch rhbz#711463 * Wed Jun 8 2011 Steve Traylen - 3.0.1-2 @@ -941,7 +945,6 @@ fi * Thu Dec 9 2010 Steve Traylen - 3.0.0-1 - New upstream 3.0.0. Drop patches torque-cond-touch.patch and torque-start-start.patch since both upstream now. ->>>>>>> master * Wed Dec 8 2010 Steve Traylen - 2.5.3-3 - Remove own copy of pbs-config. #657027