[torque/el5] Big update to 2.5.7-1, drop torque-buffer-overrun-2.3.13.patch, change license from OpenPBS to OpenP

[stevetraylen]

commit 6b1b8e65d1a9e163c4d63618c338467b60b840d9
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Tue Jul 26 14:01:36 2011 +0200

    Big update to 2.5.7-1, drop torque-buffer-overrun-2.3.13.patch,
    change license from OpenPBS to OpenPBS and TORQUEv1.1

 .gitignore                         |    1 +
 sources                            |    2 +-
 torque-buffer-overrun-2.3.13.patch |  122 ------------------------------------
 torque.spec                        |   16 +++--
 4 files changed, 11 insertions(+), 130 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 046bbc3..7bd4efa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 torque-2.3.10.tar.gz
 /torque-2.3.12.tar.gz
 /torque-2.3.13.tar.gz
+/torque-2.5.7.tar.gz
diff --git a/sources b/sources
index 18d4fa3..bc4a88c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d59ae7f27d622c4ecd3a5b07686266f2  torque-2.3.13.tar.gz
+aa033adc22df8ab333e5014dd93754b6  torque-2.5.7.tar.gz
diff --git a/torque.spec b/torque.spec
index a563ddc..b01637f 100644
--- a/torque.spec
+++ b/torque.spec
@@ -1,9 +1,9 @@
 
 # comment out snap if building a real release
 %define name torque
-%define version 2.3.13
+%define version 2.5.7
 #%%define snap 200604251602
-%define release 2
+%define release 1
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -92,9 +92,7 @@ Source4: xpbs.png
 Source5: xpbsmon.png
 Source6: README-localhost
 Source7: pbs-config-multilib
-# https://bugzilla.redhat.com/show_bug.cgi?id=711463
-Patch0:  torque-buffer-overrun-2.3.13.patch
-License: OpenPBS
+License: OpenPBS and TORQUEv1.1
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -124,7 +122,6 @@ This package holds just a few shared files and directories.
 
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
-%patch0 -p1
 %__install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} .
 
 
@@ -212,7 +209,8 @@ fi
 
 %files
 %defattr(-, root, root)
-%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt README-localhost
+%doc               README.torque torque.setup Release_Notes 
+%doc               CHANGELOG PBS_License_2.5.txt contrib/PBS_License_2.3.txt
 %config(noreplace) %{torquehomedir}/pbs_environment
 %config(noreplace) %{torquehomedir}/server_name
 %dir %{torquehomedir}
@@ -467,6 +465,10 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
 
 
 %changelog
+* Thu Jul 26 2011 Steve Traylen <steve.traylen at cern.ch> - 2.5.7-1
+- Big update to 2.5.7-1, drop torque-buffer-overrun-2.3.13.patch,
+  change license from OpenPBS to OpenPBS and TORQUEv1.1
+
 * Wed Jun 8 2011 Steve Traylen <steve.traylen at cern.ch> - 2.3.13-2
 - Add torque-buffer-overrun.patch , rhbz#711463