rpms/torque
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Adjust dependencies for install requirements, few cleanups, fix up some conditionals for obsolete deps on systemd systems, kill off bits < el6 era

Browse Source
This commit is contained in:
Peter Robinson 2018-10-16 09:10:35 +01:00
parent 37e842cfbc
commit 47116d5eab
1 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
torque.spec
View File

@ -71,7 +71,7 @@
Name: torque Name: torque
Version: 4.2.10 Version: 4.2.10
Release: 18%{?dist} Release: 19%{?dist}
Summary: Tera-scale Open-source Resource and QUEue manager Summary: Tera-scale Open-source Resource and QUEue manager
Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz
Source2: xpbs.desktop Source2: xpbs.desktop
@ -120,7 +120,7 @@ BuildRequires: tcl-devel
BuildRequires: tk-devel BuildRequires: tk-devel
%endif %endif
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
%{?systemd_requires} %{?systemd_requires}
BuildRequires: systemd BuildRequires: systemd
%endif %endif
@ -144,11 +144,7 @@ BuildRequires: tex-multirow
BuildRequires: tex-adjustbox BuildRequires: tex-adjustbox
%endif %endif
%else %else
%if 0%{?rhel} >= 6
BuildRequires: tex(latex) BuildRequires: tex(latex)
%else
BuildRequires: tetex-latex
%endif
%endif %endif
%endif %endif
@ -169,8 +165,8 @@ This package holds just a few shared files and directories.
Group: Applications/System Group: Applications/System
Summary: Client part of TORQUE Summary: Client part of TORQUE
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Requires(posttrans): chkconfig Requires(posttrans): %{_sbindir}/alternatives
Requires(preun): chkconfig Requires(preun): %{_sbindir}/alternatives
%description client %description client
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
@ -186,9 +182,7 @@ This package holds the command-line client programs.
Group: Documentation Group: Documentation
Summary: Documentation files for TORQUE Summary: Documentation files for TORQUE
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6
BuildArch: noarch BuildArch: noarch
%endif
%description docs %description docs
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
@ -260,9 +254,14 @@ Requires: munge
%if ! %{use_rcp} %if ! %{use_rcp}
Requires: openssh-clients Requires: openssh-clients
%endif %endif
Requires(post): chkconfig %if 0%{?rhel} >= 7 || 0%{?fedora}
Requires(posttrans): systemd
Requires(preun): systemd
%else
Requires(posttrans): chkconfig
Requires(preun): chkconfig Requires(preun): chkconfig
Requires(preun): initscripts Requires(preun): initscripts
%endif
@ -294,9 +293,14 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job.
Group: System Environment/Daemons Group: System Environment/Daemons
Summary: Simple fifo scheduler for TORQUE Summary: Simple fifo scheduler for TORQUE
Requires: torque-libs = %{version}-%{release} Requires: torque-libs = %{version}-%{release}
Requires(post): chkconfig %if 0%{?rhel} >= 7 || 0%{?fedora}
Requires(posttrans): systemd
Requires(preun): systemd
%else
Requires(posttrans): chkconfig
Requires(preun): chkconfig Requires(preun): chkconfig
Requires(preun): initscripts Requires(preun): initscripts
%endif
%description scheduler %description scheduler
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
@ -316,9 +320,14 @@ Requires: munge
%if ! %{use_rcp} %if ! %{use_rcp}
Requires: openssh-server Requires: openssh-server
%endif %endif
Requires(post): chkconfig %if 0%{?rhel} >= 7 || 0%{?fedora}
Requires(posttrans): systemd
Requires(preun): systemd
%else
Requires(posttrans): chkconfig
Requires(preun): chkconfig Requires(preun): chkconfig
Requires(preun): initscripts Requires(preun): initscripts
%endif
%description server %description server
TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource
@ -407,7 +416,7 @@ rm -f %{buildroot}%{_libdir}/*/buildindex
rm -f %{buildroot}/%{_lib}/security/pam_pbssimpleauth.{a,la} rm -f %{buildroot}/%{_lib}/security/pam_pbssimpleauth.{a,la}
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
# install systemd scripts # install systemd scripts
mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_unitdir}
install -p -m 644 %{SOURCE20} %{buildroot}%{_unitdir}/ install -p -m 644 %{SOURCE20} %{buildroot}%{_unitdir}/
@ -524,14 +533,14 @@ __EOF__
fi fi
done done
done done
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
%systemd_post trqauthd.service %systemd_post trqauthd.service
%else %else
/sbin/chkconfig --add trqauthd /sbin/chkconfig --add trqauthd
%endif %endif
%preun %preun
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
%systemd_preun trqauthd.service %systemd_preun trqauthd.service
%else %else
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
@ -582,14 +591,14 @@ if test -f %{torquehomedir}/mom_priv/mom.layout ; then
fi fi
%post mom %post mom
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
%systemd_post pbs_mom.service %systemd_post pbs_mom.service
%else %else
/sbin/chkconfig --add pbs_mom /sbin/chkconfig --add pbs_mom
%endif %endif
%preun mom %preun mom
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
%systemd_preun pbs_mom.service %systemd_preun pbs_mom.service
%else %else
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
@ -599,14 +608,14 @@ fi
%endif %endif
%post scheduler %post scheduler
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
%systemd_post pbs_sched.service %systemd_post pbs_sched.service
%else %else
/sbin/chkconfig --add pbs_sched /sbin/chkconfig --add pbs_sched
%endif %endif
%preun scheduler %preun scheduler
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
%systemd_preun pbs_sched.service %systemd_preun pbs_sched.service
%else %else
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
@ -616,14 +625,14 @@ fi
%endif %endif
%post server %post server
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
%systemd_post pbs_server.service %systemd_post pbs_server.service
%else %else
/sbin/chkconfig --add pbs_server /sbin/chkconfig --add pbs_server
%endif %endif
%preun server %preun server
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
%systemd_preun pbs_server.service %systemd_preun pbs_server.service
%else %else
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
@ -649,7 +658,7 @@ fi
%config(noreplace) %{_sysconfdir}/torque/server_name %config(noreplace) %{_sysconfdir}/torque/server_name
%{_mandir}/man1/pbs.1.* %{_mandir}/man1/pbs.1.*
%attr(0755, root, root) %{_sbindir}/trqauthd %attr(0755, root, root) %{_sbindir}/trqauthd
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
%{_unitdir}/trqauthd.service %{_unitdir}/trqauthd.service
%else %else
%{_initrddir}/trqauthd %{_initrddir}/trqauthd
@ -789,7 +798,7 @@ fi
%{_sbindir}/qnoded %{_sbindir}/qnoded
%{_sbindir}/pbs_demux %{_sbindir}/pbs_demux
%{_bindir}/pbs_track %{_bindir}/pbs_track
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
%{_unitdir}/pbs_mom.service %{_unitdir}/pbs_mom.service
%else %else
%{_initrddir}/pbs_mom %{_initrddir}/pbs_mom
@ -813,7 +822,7 @@ fi
%files scheduler %files scheduler
%attr(0755, root, root) %{_sbindir}/pbs_sched %attr(0755, root, root) %{_sbindir}/pbs_sched
%{_sbindir}/qschedd %{_sbindir}/qschedd
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
%{_unitdir}/pbs_sched.service %{_unitdir}/pbs_sched.service
%else %else
%{_initrddir}/pbs_sched %{_initrddir}/pbs_sched
@ -835,7 +844,7 @@ fi
%files server %files server
%attr(0755, root, root) %{_sbindir}/pbs_server %attr(0755, root, root) %{_sbindir}/pbs_server
%{_sbindir}/qserverd %{_sbindir}/qserverd
%if 0%{?rhel} >= 7 || 0%{?fedora} > 0 %if 0%{?rhel} >= 7 || 0%{?fedora}
%{_unitdir}/pbs_server.service %{_unitdir}/pbs_server.service
%else %else
%{_initrddir}/pbs_server %{_initrddir}/pbs_server
@ -855,7 +864,6 @@ fi
%{_mandir}/man3/compat.h.3.* %{_mandir}/man3/compat.h.3.*
%{_mandir}/man3/drmaa.3.* %{_mandir}/man3/drmaa.3.*
%{_mandir}/man3/drmaa.h.3.* %{_mandir}/man3/drmaa.h.3.*
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 6
%{_mandir}/man3/drmaa_attr_names_s.3.* %{_mandir}/man3/drmaa_attr_names_s.3.*
%{_mandir}/man3/drmaa_attr_values_s.3.* %{_mandir}/man3/drmaa_attr_values_s.3.*
%{_mandir}/man3/drmaa_attrib.3.* %{_mandir}/man3/drmaa_attrib.3.*
@ -864,7 +872,6 @@ fi
%{_mandir}/man3/drmaa_job_ids_s.3.* %{_mandir}/man3/drmaa_job_ids_s.3.*
%{_mandir}/man3/drmaa_def_attr_s.3.* %{_mandir}/man3/drmaa_def_attr_s.3.*
%{_mandir}/man3/pbs_attrib.3.* %{_mandir}/man3/pbs_attrib.3.*
%endif
%{_mandir}/man3/drmaa_viter.3.* %{_mandir}/man3/drmaa_viter.3.*
%{_mandir}/man3/drmaa_job_iter_s.3.* %{_mandir}/man3/drmaa_job_iter_s.3.*
%{_mandir}/man3/drmaa_job_s.3.* %{_mandir}/man3/drmaa_job_s.3.*
@ -879,6 +886,9 @@ fi
%endif %endif
%changelog %changelog
* Mon Oct 15 2018 Peter Robinson <pbrobinson@fedoraproject.org> 4.2.10-19
- Adjust dependencies for install requirements, few cleanups
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.10-18 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.10-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild