Updated RPM to depend on the new gratia-probe-condor-ap package inste…

…ad of including a probe config here

rpm/80-osg-flocking.conf

@@ -49,16 +49,4 @@ if version < 8.9.6
 
 endif
 
-# Put history.* files into the gratia data directory
-# in order for gratia to submit usage.
-PER_JOB_HISTORY_DIR = /var/lib/gratia/data/
-
-# Gratia probe
-SCHEDD_CRON_JOBLIST = $(SCHEDD_CRON_JOBLIST) GRATIA
-SCHEDD_CRON_GRATIA_MODE = Periodic
-SCHEDD_CRON_GRATIA_PERIOD = 15m
-SCHEDD_CRON_GRATIA_EXECUTABLE = /usr/share/gratia/condor/condor_meter
-SCHEDD_CRON_GRATIA_PREFIX = GRATIA
-SCHEDD_CRON_GRATIA_ARGS = -f /etc/gratia/condor/ProbeConfig-OSPool
-
 

rpm/osg-flock.spec

@@ -1,5 +1,5 @@
 Name:      osg-flock
-Version:   1.5
+Version:   1.6
 Release:   1%{?dist}
 Summary:   OSG configurations for a flocking host
 
@@ -8,7 +8,7 @@ URL:       https://opensciencegrid.org/docs/submit/osg-flock
 
 BuildArch: noarch
 
-Requires: gratia-probe-condor
+Requires: gratia-probe-condor-ap
 Requires: condor
 
 Source0: %{name}-%{version}%{?gitrev:-%{gitrev}}.tar.gz
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Oct 25 2021 Mats Rynge <[email protected]> 1.6-1
+- Now requires gratia-probe-condor-ap, probe config has been removed
+
 * Fri Oct 1 2021 Mats Rynge <[email protected]> 1.5-1
 - Moved to new HTCondor Cron Gratia setup