From f463b40067b32fc8542112b0835fdc43cb832692 Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Tue, 8 Mar 2011 20:00:03 +0100
Subject: [PATCH] New upstream 2.5.5 Drop torque-create-request.patch since
 fixed upstream. Torque License change, PBS_License.txt now
 contrib/PBS_License2.3.txt New additional license file PBS_License_2.5.txt
 License field changed from OpenPBS to "OpenPBS and TORQUEv1.1"

---
 .gitignore  |  1 +
 sources     |  2 +-
 torque.spec | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50b70e2..0634122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /torque-2.5.2.tar.gz
 /torque-2.5.3.tar.gz
 /torque-2.5.4.tar.gz
+/torque-2.5.5.tar.gz
diff --git a/sources b/sources
index 39aa1b2..144f48f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6fa9e06ec7edc949bc6e005c9b3e7256  torque-2.5.4.tar.gz
+8c986704b0cfedc474ec236a100ab9b6  torque-2.5.5.tar.gz
diff --git a/torque.spec b/torque.spec
index 9578ff0..9f2d483 100644
--- a/torque.spec
+++ b/torque.spec
@@ -67,7 +67,7 @@
 %global server_nameflags --with-default-server=%{server_name}
 
 Name:        torque
-Version:     2.5.4
+Version:     2.5.5
 Release:     1%{?dist}
 Summary:     Tera-scale Open-source Resource and QUEue manager
 Source0:     http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
@@ -77,9 +77,8 @@ Source4:     xpbs.png
 Source5:     xpbsmon.png
 Source6:     README.Fedora
 Source8:     config
-# https://bugzilla.redhat.com/show_bug.cgi?id=631256
-Patch1:      torque-create-request.patch
-License:     OpenPBS
+
+License:     OpenPBS and TORQUEv1.1
 Group:       System Environment/Daemons
 URL:         http://www.clusterresources.com/products/torque/
 %if 0%{?el4}%{?el5}
@@ -329,7 +328,6 @@ DRMAA is "Distributed Resource Management Application API"
 
 %prep
 %setup -q
-%patch1 -p1
 install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
    %{SOURCE6} %{SOURCE8} .
 # rm x bit on some documentation.
@@ -530,7 +528,8 @@ fi
 %files
 %defattr(-, root, root, -)
 %doc               README.torque torque.setup Release_Notes 
-%doc               CHANGELOG PBS_License.txt README.Fedora
+%doc               CHANGELOG PBS_License_2.5.txt README.Fedora
+%doc               contrib/PBS_License_2.3.txt
 %dir %{torquehomedir} 
 %dir %{torquehomedir}/aux
 %dir %{torquehomedir}/spool
@@ -768,6 +767,14 @@ fi
 %endif
 
 %changelog
+* Tue Mar 8 2011 Steve Traylen <steve.traylen@cern.ch> - 2.5.5-1
+- New upstream 2.5.5
+  Drop torque-create-request.patch since fixed upstream.
+- Torque License change, 
+    PBS_License.txt now contrib/PBS_License2.3.txt 
+    New additional license file PBS_License_2.5.txt
+  License field changed from OpenPBS to "OpenPBS and TORQUEv1.1"
+
 * Sun Jan 9 2011 Steve Traylen <steve.traylen@cern.ch> - 2.5.4-1
 - New upstream 2.5.4
   Drop patches: torque-cond-touch.patch rhbz#528060 and