Compare commits
No commits in common. "c8" and "imports/c8-beta/torque-4.2.10-17.el8" have entirely different histories.
c8
...
imports/c8
|
|
@ -1,6 +0,0 @@
|
|||
#!/usr/bin/sh
|
||||
|
||||
MACHINE_TYPE=`uname -m`
|
||||
|
||||
source /usr/bin/pbs-config-$MACHINE_TYPE
|
||||
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
|
||||
Name: torque
|
||||
Version: 4.2.10
|
||||
Release: 25%{?dist}
|
||||
Release: 17%{?dist}
|
||||
Summary: Tera-scale Open-source Resource and QUEue manager
|
||||
Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz
|
||||
Source2: xpbs.desktop
|
||||
|
|
@ -90,8 +90,6 @@ Source24: mom.layout
|
|||
# I'll announce to fedora-devel once this is resolved either way.
|
||||
# Fedora approval of TORQUEv1.1
|
||||
# http://lists.fedoraproject.org/pipermail/legal/2011-February/001530.html
|
||||
# This is a wrapper for multilib
|
||||
Source100: pbs-config
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=713996
|
||||
Patch1: torque-munge-size.patch
|
||||
|
|
@ -102,8 +100,8 @@ Patch3: torque-%{version}-fix-bad-crypto-check.patch
|
|||
Patch4: torque-%{version}-remove-unused-header.patch
|
||||
|
||||
License: OpenPBS and TORQUEv1.1
|
||||
Group: System Environment/Daemons
|
||||
URL: http://www.adaptivecomputing.com/products/open-source/torque/
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: xauth
|
||||
|
|
@ -121,7 +119,7 @@ BuildRequires: tcl-devel
|
|||
BuildRequires: tk-devel
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
%{?systemd_requires}
|
||||
BuildRequires: systemd
|
||||
%endif
|
||||
|
|
@ -145,12 +143,15 @@ BuildRequires: tex-multirow
|
|||
BuildRequires: tex-adjustbox
|
||||
%endif
|
||||
%else
|
||||
%if 0%{?rhel} >= 6
|
||||
BuildRequires: tex(latex)
|
||||
%else
|
||||
BuildRequires: tetex-latex
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
Requires: munge
|
||||
Requires: torque-libs = %{version}-%{release}
|
||||
Requires(post): %{_bindir}/grep %{_bindir}/cat /etc/services
|
||||
|
||||
%description
|
||||
|
|
@ -164,10 +165,11 @@ other leading edge HPC organizations.
|
|||
This package holds just a few shared files and directories.
|
||||
|
||||
%package client
|
||||
Group: Applications/System
|
||||
Summary: Client part of TORQUE
|
||||
Requires: %{name}-libs = %{version}-%{release}
|
||||
Requires(posttrans): %{_sbindir}/alternatives
|
||||
Requires(preun): %{_sbindir}/alternatives
|
||||
Requires(posttrans): chkconfig
|
||||
Requires(preun): chkconfig
|
||||
|
||||
%description client
|
||||
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
|
||||
|
|
@ -180,9 +182,12 @@ other leading edge HPC organizations.
|
|||
This package holds the command-line client programs.
|
||||
|
||||
%package docs
|
||||
Group: Documentation
|
||||
Summary: Documentation files for TORQUE
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
|
||||
%description docs
|
||||
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
|
||||
|
|
@ -195,9 +200,9 @@ other leading edge HPC organizations.
|
|||
This package holds the documentation files.
|
||||
|
||||
%package gui
|
||||
Group: Applications/System
|
||||
Summary: Graphical clients for TORQUE
|
||||
Requires: torque-client = %{version}-%{release}
|
||||
Requires: torque-libs = %{version}-%{release}
|
||||
|
||||
%description gui
|
||||
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
|
||||
|
|
@ -211,6 +216,7 @@ This package holds the graphical clients.
|
|||
|
||||
%package libs
|
||||
Summary: Run-time libs for programs which will use the %{name} library
|
||||
Group: Development/Libraries
|
||||
Requires: munge
|
||||
Obsoletes: libtorque < 2.4.8-2
|
||||
Provides: libtorque = %{version}-%{release}
|
||||
|
|
@ -229,6 +235,7 @@ programs.
|
|||
|
||||
%package devel
|
||||
Summary: Development tools for programs which will use the %{name} library
|
||||
Group: Development/Libraries
|
||||
Requires: torque-libs = %{version}-%{release}
|
||||
Obsoletes: libtorque-devel < 2.4.8-2
|
||||
Provides: libtorque-devel = %{version}-%{release}
|
||||
|
|
@ -245,20 +252,16 @@ This package includes the header files and static libraries
|
|||
necessary for developing programs which will use %{name}.
|
||||
|
||||
%package mom
|
||||
Group: System Environment/Daemons
|
||||
Summary: Node execution daemon for TORQUE
|
||||
Requires: torque-libs = %{version}-%{release}
|
||||
Requires: munge
|
||||
%if ! %{use_rcp}
|
||||
Requires: openssh-clients
|
||||
%endif
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
Requires(posttrans): systemd
|
||||
Requires(preun): systemd
|
||||
%else
|
||||
Requires(posttrans): chkconfig
|
||||
Requires(preun): chkconfig
|
||||
Requires(post): chkconfig
|
||||
Requires(preun): chkconfig
|
||||
Requires(preun): initscripts
|
||||
%endif
|
||||
|
||||
|
||||
|
||||
|
|
@ -274,6 +277,7 @@ This package holds the execute daemon required on every node.
|
|||
|
||||
%package pam
|
||||
Summary: PAM module for TORQUE MOM nodes
|
||||
Group: System Environment/Base
|
||||
|
||||
%description pam
|
||||
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
|
||||
|
|
@ -286,16 +290,12 @@ other leading edge HPC organizations.
|
|||
A simple PAM module to authorize users on PBS MOM nodes with a running job.
|
||||
|
||||
%package scheduler
|
||||
Group: System Environment/Daemons
|
||||
Summary: Simple fifo scheduler for TORQUE
|
||||
Requires: torque-libs = %{version}-%{release}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
Requires(posttrans): systemd
|
||||
Requires(preun): systemd
|
||||
%else
|
||||
Requires(posttrans): chkconfig
|
||||
Requires(preun): chkconfig
|
||||
Requires(post): chkconfig
|
||||
Requires(preun): chkconfig
|
||||
Requires(preun): initscripts
|
||||
%endif
|
||||
|
||||
%description scheduler
|
||||
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
|
||||
|
|
@ -308,20 +308,16 @@ other leading edge HPC organizations.
|
|||
This package holds the fifo C scheduler.
|
||||
|
||||
%package server
|
||||
Group: System Environment/Daemons
|
||||
Summary: The main part of TORQUE
|
||||
Requires: torque-libs = %{version}-%{release}
|
||||
Requires: munge
|
||||
%if ! %{use_rcp}
|
||||
Requires: openssh-server
|
||||
%endif
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
Requires(posttrans): systemd
|
||||
Requires(preun): systemd
|
||||
%else
|
||||
Requires(posttrans): chkconfig
|
||||
Requires(preun): chkconfig
|
||||
Requires(preun): initscripts
|
||||
%endif
|
||||
Requires(post): chkconfig
|
||||
Requires(preun): chkconfig
|
||||
Requires(preun): initscripts
|
||||
|
||||
%description server
|
||||
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
|
||||
|
|
@ -334,6 +330,7 @@ other leading edge HPC organizations.
|
|||
This package holds the server.
|
||||
|
||||
%package drmaa
|
||||
Group: System Environment/Daemons
|
||||
Summary: Run time files for the drmaa interface
|
||||
Requires: torque-libs = %{version}-%{release}
|
||||
|
||||
|
|
@ -350,6 +347,7 @@ DRMAA is "Distributed Resource Management Application API"
|
|||
|
||||
|
||||
%package drmaa-devel
|
||||
Group: System Environment/Daemons
|
||||
Summary: Development files for the drmaa interface.
|
||||
Requires: torque-drmaa = %{version}-%{release}
|
||||
Requires: torque-devel = %{version}-%{release}
|
||||
|
|
@ -408,7 +406,7 @@ rm -f %{buildroot}%{_libdir}/*/buildindex
|
|||
rm -f %{buildroot}/%{_lib}/security/pam_pbssimpleauth.{a,la}
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
# install systemd scripts
|
||||
mkdir -p %{buildroot}%{_unitdir}
|
||||
install -p -m 644 %{SOURCE20} %{buildroot}%{_unitdir}/
|
||||
|
|
@ -511,9 +509,8 @@ rm %{buildroot}%{_mandir}/man1/basl2c.1
|
|||
# fix permissions for some directories in /var/lib/torque
|
||||
chmod 755 `find %{buildroot}/var/lib/torque -type d`
|
||||
|
||||
# Use wrapper script for pbs-config and rename original script to include architecture name
|
||||
mv %{buildroot}%{_bindir}/pbs-config %{buildroot}%{_bindir}/pbs-config-%{_arch}
|
||||
install -m0755 -p %{SOURCE100} %{buildroot}%{_bindir}/pbs-config
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
# fix mistake in previous release
|
||||
|
|
@ -529,14 +526,14 @@ __EOF__
|
|||
fi
|
||||
done
|
||||
done
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
%systemd_post trqauthd.service
|
||||
%else
|
||||
/sbin/chkconfig --add trqauthd
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
%systemd_preun trqauthd.service
|
||||
%else
|
||||
if [ $1 -eq 0 ]; then
|
||||
|
|
@ -573,8 +570,10 @@ if [ $1 -eq 0 ]; then
|
|||
/usr/sbin/alternatives --remove qsub %{_bindir}/qsub-torque
|
||||
fi
|
||||
|
||||
%ldconfig_scriptlets libs
|
||||
%ldconfig_scriptlets drmaa
|
||||
%post libs -p /sbin/ldconfig
|
||||
%postun libs -p /sbin/ldconfig
|
||||
%post drmaa -p /sbin/ldconfig
|
||||
%postun drmaa -p /sbin/ldconfig
|
||||
|
||||
%pre mom
|
||||
if test -f %{torquehomedir}/mom_priv/mom.layout ; then
|
||||
|
|
@ -585,14 +584,14 @@ if test -f %{torquehomedir}/mom_priv/mom.layout ; then
|
|||
fi
|
||||
|
||||
%post mom
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
%systemd_post pbs_mom.service
|
||||
%else
|
||||
/sbin/chkconfig --add pbs_mom
|
||||
%endif
|
||||
|
||||
%preun mom
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
%systemd_preun pbs_mom.service
|
||||
%else
|
||||
if [ $1 -eq 0 ]; then
|
||||
|
|
@ -602,14 +601,14 @@ fi
|
|||
%endif
|
||||
|
||||
%post scheduler
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
%systemd_post pbs_sched.service
|
||||
%else
|
||||
/sbin/chkconfig --add pbs_sched
|
||||
%endif
|
||||
|
||||
%preun scheduler
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
%systemd_preun pbs_sched.service
|
||||
%else
|
||||
if [ $1 -eq 0 ]; then
|
||||
|
|
@ -619,14 +618,14 @@ fi
|
|||
%endif
|
||||
|
||||
%post server
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
%systemd_post pbs_server.service
|
||||
%else
|
||||
/sbin/chkconfig --add pbs_server
|
||||
%endif
|
||||
|
||||
%preun server
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
%systemd_preun pbs_server.service
|
||||
%else
|
||||
if [ $1 -eq 0 ]; then
|
||||
|
|
@ -636,7 +635,8 @@ fi
|
|||
%endif
|
||||
|
||||
%files
|
||||
%doc README.torque torque.setup Release_Notes
|
||||
%defattr(-, root, root, -)
|
||||
%doc README.torque torque.setup Release_Notes
|
||||
%doc CHANGELOG PBS_License.txt README.Fedora contrib/PBS_License_2.3.txt
|
||||
%dir %{torquehomedir}
|
||||
%dir %{torquehomedir}/aux
|
||||
|
|
@ -652,13 +652,14 @@ fi
|
|||
%config(noreplace) %{_sysconfdir}/torque/server_name
|
||||
%{_mandir}/man1/pbs.1.*
|
||||
%attr(0755, root, root) %{_sbindir}/trqauthd
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
%{_unitdir}/trqauthd.service
|
||||
%else
|
||||
%{_initrddir}/trqauthd
|
||||
%endif
|
||||
|
||||
%files client
|
||||
%defattr(-, root, root, -)
|
||||
%{_bindir}/q*
|
||||
%{_bindir}/chk_tree
|
||||
%{_bindir}/hostn
|
||||
|
|
@ -726,6 +727,7 @@ fi
|
|||
|
||||
|
||||
%files docs
|
||||
%defattr(-, root, root, -)
|
||||
%doc doc/admin_guide.ps
|
||||
%if 0%{?doxydoc}
|
||||
%doc src/drmaa/drmaa.pdf
|
||||
|
|
@ -733,6 +735,7 @@ fi
|
|||
|
||||
%if %{build_gui}
|
||||
%files gui
|
||||
%defattr(-, root, root, -)
|
||||
%{_bindir}/pbs_wish
|
||||
%{_bindir}/xpbs
|
||||
%{_bindir}/xpbsmon
|
||||
|
|
@ -745,14 +748,15 @@ fi
|
|||
%endif
|
||||
|
||||
%files libs
|
||||
%defattr(-, root, root, -)
|
||||
%{_libdir}/libtorque.so.*
|
||||
|
||||
%files devel
|
||||
%defattr(-, root, root, -)
|
||||
%{_libdir}/libtorque.so
|
||||
%{_includedir}/torque
|
||||
%exclude %{_includedir}/torque/drmaa.h
|
||||
%{_bindir}/pbs-config
|
||||
%{_bindir}/pbs-config-%{_arch}
|
||||
%{_mandir}/man3/pbs_alterjob.3.*
|
||||
%{_mandir}/man3/pbs_connect.3.*
|
||||
%{_mandir}/man3/pbs_default.3.*
|
||||
|
|
@ -788,12 +792,13 @@ fi
|
|||
%{_mandir}/man3/tm.3.*
|
||||
|
||||
%files mom
|
||||
%defattr(-, root, root, -)
|
||||
%{_sbindir}/momctl
|
||||
%{_sbindir}/pbs_mom
|
||||
%{_sbindir}/qnoded
|
||||
%{_sbindir}/pbs_demux
|
||||
%{_bindir}/pbs_track
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
%{_unitdir}/pbs_mom.service
|
||||
%else
|
||||
%{_initrddir}/pbs_mom
|
||||
|
|
@ -811,13 +816,15 @@ fi
|
|||
%config(noreplace) %{_sysconfdir}/torque/mom/mom.layout
|
||||
|
||||
%files pam
|
||||
%defattr(-, root, root, -)
|
||||
%doc src/pam/README.pam
|
||||
/%{_lib}/security/pam_pbssimpleauth.so
|
||||
|
||||
%files scheduler
|
||||
%defattr(-, root, root, -)
|
||||
%attr(0755, root, root) %{_sbindir}/pbs_sched
|
||||
%{_sbindir}/qschedd
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
%{_unitdir}/pbs_sched.service
|
||||
%else
|
||||
%{_initrddir}/pbs_sched
|
||||
|
|
@ -837,9 +844,10 @@ fi
|
|||
%config(noreplace) %{_sysconfdir}/torque/sched/sched_config
|
||||
|
||||
%files server
|
||||
%defattr(-, root, root, -)
|
||||
%attr(0755, root, root) %{_sbindir}/pbs_server
|
||||
%{_sbindir}/qserverd
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora}
|
||||
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
|
||||
%{_unitdir}/pbs_server.service
|
||||
%else
|
||||
%{_initrddir}/pbs_server
|
||||
|
|
@ -850,15 +858,18 @@ fi
|
|||
%{_mandir}/man8/pbs_server.8.*
|
||||
|
||||
%files drmaa
|
||||
%defattr(-, root, root, -)
|
||||
%{_libdir}/libdrmaa.so.*
|
||||
|
||||
%files drmaa-devel
|
||||
%defattr(-, root, root, -)
|
||||
%{_libdir}/libdrmaa.so
|
||||
%{_includedir}/torque/drmaa.h
|
||||
%if 0%{?doxydoc}
|
||||
%{_mandir}/man3/compat.h.3.*
|
||||
%{_mandir}/man3/drmaa.3.*
|
||||
%{_mandir}/man3/drmaa.h.3.*
|
||||
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 6
|
||||
%{_mandir}/man3/drmaa_attr_names_s.3.*
|
||||
%{_mandir}/man3/drmaa_attr_values_s.3.*
|
||||
%{_mandir}/man3/drmaa_attrib.3.*
|
||||
|
|
@ -867,6 +878,7 @@ fi
|
|||
%{_mandir}/man3/drmaa_job_ids_s.3.*
|
||||
%{_mandir}/man3/drmaa_def_attr_s.3.*
|
||||
%{_mandir}/man3/pbs_attrib.3.*
|
||||
%endif
|
||||
%{_mandir}/man3/drmaa_viter.3.*
|
||||
%{_mandir}/man3/drmaa_job_iter_s.3.*
|
||||
%{_mandir}/man3/drmaa_job_s.3.*
|
||||
|
|
@ -881,17 +893,6 @@ fi
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jul 08 2020 Honggang Li <honli@redhat.com> - 4.2.10-25
|
||||
- Rebase to latest Fedora release
|
||||
- Fix file conflicts in torque-devel multilib packages
|
||||
- Resolve: bz1853167
|
||||
|
||||
* Fri Jun 07 2019 Jarod Wilson <jarod@redhat.com> - 4.2.10-19
|
||||
- Put pbs-config in base pkg where it belongs instead of -devel
|
||||
|
||||
* Fri May 31 2019 Jarod Wilson <jarod@redhat.com> - 4.2.10-18
|
||||
- Rebuild for CI testing
|
||||
|
||||
* Wed Feb 07 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 4.2.10-17
|
||||
- Remove old Requires
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue