From b29a5060e1d257306e35a9c3ff4c0778c3acb7bc Mon Sep 17 00:00:00 2001 From: Tim Theisen Date: Wed, 20 Sep 2023 14:55:26 -0500 Subject: [PATCH] HTCONDOR-2004: Adjust spec file for a world without a blahp RPM --- rpm/htcondor-ce.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/rpm/htcondor-ce.spec b/rpm/htcondor-ce.spec index 3887ab7be..e1dde3f87 100644 --- a/rpm/htcondor-ce.spec +++ b/rpm/htcondor-ce.spec @@ -30,7 +30,8 @@ BuildRequires: python3-rpm-macros # https://opensciencegrid.atlassian.net/browse/HTCONDOR-244 # Need 9.0.1 for the C++ collector plugin # https://opensciencegrid.atlassian.net/browse/HTCONDOR-1326 -Requires: condor >= 9.0.1 +# The blahp was moved to the condor package in HTCondor 9.5.0 +Requires: condor >= 9.5.0 # Init script doesn't function without `which` (which is no longer part of RHEL7 base). Requires: which @@ -113,7 +114,6 @@ Requires: %{name} = %{version}-%{release} Group: Applications/System Summary: Default routes for submission to PBS Requires: %{name} = %{version}-%{release} -Requires: blahp %description pbs %{summary} @@ -122,7 +122,6 @@ Requires: blahp Group: Applications/System Summary: Default routes for submission to LSF Requires: %{name} = %{version}-%{release} -Requires: blahp %description lsf %{summary} @@ -131,7 +130,6 @@ Requires: blahp Group: Applications/System Summary: Default routes for submission to SGE Requires: %{name} = %{version}-%{release} -Requires: blahp %description sge %{summary} @@ -140,7 +138,6 @@ Requires: blahp Group: Applications/System Summary: Default routes for submission to Slurm Requires: %{name} = %{version}-%{release} -Requires: blahp %description slurm %{summary}