[torque/el6/master] - New upstream 2.5.4 Drop patches: torque-cond-touch.patch rhbz#528060 and torque-start-start.pa

[stevetraylen]

commit d3a5d23cde713b8f4bf62ca7ca0e8db77a75895e
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Sun Jan 9 22:27:46 2011 +0100

    - New upstream 2.5.4
      Drop patches: torque-cond-touch.patch rhbz#528060 and
      torque-start-start.patch rhbz#643194 since both upstream.

 .gitignore               |    1 +
 sources                  |    2 +-
 torque-cond-touch.patch  |   45 -----------------------------
 torque-start-start.patch |   71 ----------------------------------------------
 torque.spec              |   15 ++++-----
 5 files changed, 9 insertions(+), 125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 808b65c..50b70e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /torque-2.5.2.tar.gz
 /torque-2.5.3.tar.gz
+/torque-2.5.4.tar.gz
diff --git a/sources b/sources
index 4175e51..39aa1b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7868cf95582e20f2725651f97266947  torque-2.5.3.tar.gz
+6fa9e06ec7edc949bc6e005c9b3e7256  torque-2.5.4.tar.gz
diff --git a/torque.spec b/torque.spec
index 97deef1..9578ff0 100644
--- a/torque.spec
+++ b/torque.spec
@@ -67,8 +67,8 @@
 %global server_nameflags --with-default-server=%{server_name}
 
 Name:        torque
-Version:     2.5.3
-Release:     3%{?dist}
+Version:     2.5.4
+Release:     1%{?dist}
 Summary:     Tera-scale Open-source Resource and QUEue manager
 Source0:     http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
 Source2:     xpbs.desktop
@@ -77,12 +77,8 @@ Source4:     xpbs.png
 Source5:     xpbsmon.png
 Source6:     README.Fedora
 Source8:     config
-# https://bugzilla.redhat.com/show_bug.cgi?id=528060
-Patch0:      torque-cond-touch.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=631256
 Patch1:      torque-create-request.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=643194
-Patch2:      torque-start-start.patch
 License:     OpenPBS
 Group:       System Environment/Daemons
 URL:         http://www.clusterresources.com/products/torque/
@@ -333,9 +329,7 @@ DRMAA is "Distributed Resource Management Application API"
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
    %{SOURCE6} %{SOURCE8} .
 # rm x bit on some documentation.
@@ -774,6 +768,11 @@ fi
 %endif
 
 %changelog
+* Sun Jan 9 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.4-1
+- New upstream 2.5.4
+  Drop patches: torque-cond-touch.patch rhbz#528060 and
+  torque-start-start.patch rhbz#643194 since both upstream.
+
 * Wed Dec 8 2010 Steve Traylen <steve.traylen at cern.ch> - 2.5.3-3
 - Remove own copy of pbs-config. #657027
 - Move man pages from doc subpackage to relavent sub package.