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"
This commit is contained in:
Steve Traylen 2011-03-08 20:00:03 +01:00
parent d3a5d23cde
commit f463b40067
3 changed files with 15 additions and 7 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/torque-2.5.2.tar.gz /torque-2.5.2.tar.gz
/torque-2.5.3.tar.gz /torque-2.5.3.tar.gz
/torque-2.5.4.tar.gz /torque-2.5.4.tar.gz
/torque-2.5.5.tar.gz

View File

@ -1 +1 @@
6fa9e06ec7edc949bc6e005c9b3e7256 torque-2.5.4.tar.gz 8c986704b0cfedc474ec236a100ab9b6 torque-2.5.5.tar.gz

View File

@ -67,7 +67,7 @@
%global server_nameflags --with-default-server=%{server_name} %global server_nameflags --with-default-server=%{server_name}
Name: torque Name: torque
Version: 2.5.4 Version: 2.5.5
Release: 1%{?dist} Release: 1%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz Source0: http://www.clusterresources.com/downloads/%{name}/%{name}-%{version}.tar.gz
@ -77,9 +77,8 @@ Source4: xpbs.png
Source5: xpbsmon.png Source5: xpbsmon.png
Source6: README.Fedora Source6: README.Fedora
Source8: config Source8: config
# https://bugzilla.redhat.com/show_bug.cgi?id=631256
Patch1: torque-create-request.patch License: OpenPBS and TORQUEv1.1
License: OpenPBS
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.clusterresources.com/products/torque/ URL: http://www.clusterresources.com/products/torque/
%if 0%{?el4}%{?el5} %if 0%{?el4}%{?el5}
@ -329,7 +328,6 @@ DRMAA is "Distributed Resource Management Application API"
%prep %prep
%setup -q %setup -q
%patch1 -p1
install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \ install -pm 644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} \
%{SOURCE6} %{SOURCE8} . %{SOURCE6} %{SOURCE8} .
# rm x bit on some documentation. # rm x bit on some documentation.
@ -530,7 +528,8 @@ fi
%files %files
%defattr(-, root, root, -) %defattr(-, root, root, -)
%doc README.torque torque.setup Release_Notes %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}
%dir %{torquehomedir}/aux %dir %{torquehomedir}/aux
%dir %{torquehomedir}/spool %dir %{torquehomedir}/spool
@ -768,6 +767,14 @@ fi
%endif %endif
%changelog %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 * Sun Jan 9 2011 Steve Traylen <steve.traylen@cern.ch> - 2.5.4-1
- New upstream 2.5.4 - New upstream 2.5.4
Drop patches: torque-cond-touch.patch rhbz#528060 and Drop patches: torque-cond-touch.patch rhbz#528060 and