resolve multilib conflict on pbs-config script

This commit is contained in:
Tom Callaway 2020-07-02 10:12:53 -04:00
parent d0d64946c0
commit 9c2a506b8d
2 changed files with 17 additions and 1 deletions

6
pbs-config Normal file
View File

@ -0,0 +1,6 @@
#!/usr/bin/sh
MACHINE_TYPE=`uname -m`
source /usr/bin/pbs-config-$MACHINE_TYPE

View File

@ -71,7 +71,7 @@
Name: torque
Version: 4.2.10
Release: 23%{?dist}
Release: 24%{?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,6 +90,8 @@ 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
@ -513,6 +515,10 @@ 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
%post
# fix mistake in previous release
sed -i '/pbs_mon/D' /etc/services
@ -750,6 +756,7 @@ fi
%{_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.*
@ -878,6 +885,9 @@ fi
%endif
%changelog
* Thu Jul 2 2020 Tom Callaway <spot@fedoraproject.org> - 4.2.10-24
- resolve multilib conflict on pbs-config script
* Tue Sep 3 2019 Tom Callaway <spot@fedoraproject.org> - 4.2.10-23
- revive