From 4334bf943b022da05d0776e1512f88ff506a534c Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 9 Jul 2020 11:28:21 -0400 Subject: [PATCH] improve -libs Requires --- torque.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/torque.spec b/torque.spec index 80c66ad..ba13e11 100644 --- a/torque.spec +++ b/torque.spec @@ -71,7 +71,7 @@ Name: torque Version: 4.2.10 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Tera-scale Open-source Resource and QUEue manager Source0: http://www.adaptivecomputing.com/download/%{name}/%{name}-%{version}.tar.gz Source2: xpbs.desktop @@ -170,7 +170,7 @@ This package holds just a few shared files and directories. %package client Summary: Client part of TORQUE -Requires: %{name}-libs = %{version}-%{release} +Requires: torque-libs%{_isa} = %{version}-%{release} Requires(posttrans): %{_sbindir}/alternatives Requires(preun): %{_sbindir}/alternatives @@ -202,6 +202,7 @@ This package holds the documentation files. %package gui Summary: Graphical clients for TORQUE Requires: torque-client = %{version}-%{release} +Requires: torque-libs%{_isa} = %{version}-%{release} %description gui TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource @@ -233,7 +234,7 @@ programs. %package devel Summary: Development tools for programs which will use the %{name} library -Requires: torque-libs = %{version}-%{release} +Requires: torque-libs%{_isa} = %{version}-%{release} Obsoletes: libtorque-devel < 2.4.8-2 Provides: libtorque-devel = %{version}-%{release} @@ -250,7 +251,7 @@ necessary for developing programs which will use %{name}. %package mom Summary: Node execution daemon for TORQUE -Requires: torque-libs = %{version}-%{release} +Requires: torque-libs%{_isa} = %{version}-%{release} Requires: munge %if ! %{use_rcp} Requires: openssh-clients @@ -291,7 +292,7 @@ A simple PAM module to authorize users on PBS MOM nodes with a running job. %package scheduler Summary: Simple fifo scheduler for TORQUE -Requires: torque-libs = %{version}-%{release} +Requires: torque-libs%{_isa} = %{version}-%{release} %if 0%{?rhel} >= 7 || 0%{?fedora} Requires(posttrans): systemd Requires(preun): systemd @@ -313,7 +314,7 @@ This package holds the fifo C scheduler. %package server Summary: The main part of TORQUE -Requires: torque-libs = %{version}-%{release} +Requires: torque-libs%{_isa} = %{version}-%{release} Requires: munge %if ! %{use_rcp} Requires: openssh-server @@ -339,7 +340,7 @@ This package holds the server. %package drmaa Summary: Run time files for the drmaa interface -Requires: torque-libs = %{version}-%{release} +Requires: torque-libs%{_isa} = %{version}-%{release} %description drmaa TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource @@ -885,6 +886,9 @@ fi %endif %changelog +* Thu Jul 9 2020 Tom Callaway - 4.2.10-26 +- improve -libs Requires + * Thu Jul 2 2020 Tom Callaway - 4.2.10-25 - resolve multilib conflict on pbs-config script