Merge pull request #140 from brianhlin/fix-condor-config

Fix condor config and some spec issues

Author: matyasselmeci

htcondor-ce/50-gratia-ce.conf

@@ -4,7 +4,7 @@
 
 if ! defined JOB_ROUTER_SCHEDD2_NAME
    PER_JOB_HISTORY_DIR = /var/lib/condor-ce/gratia/data
-end
+endif
 
 
 # Setup cron job for gratia-probe-htcondor-ce

rpm/gratia-probe.spec

@@ -1,7 +1,7 @@
 Name:               gratia-probe
 Summary:            Gratia OSG accounting system probes
 Group:              Applications/System
-Version:            2.5.0
+Version:            2.5.1
 Release:            1%{?dist}
 License:            GPL
 URL:                http://sourceforge.net/projects/gratia/
@@ -175,6 +175,7 @@ git_commit_id=$(gzip -d < %{SOURCE0} | git get-tar-commit-id)
   rm $RPM_BUILD_ROOT%{_datadir}/gratia/dCache-transfer/gratia-dcache-transfer.init
 
   # Install condor-ap configuration snippet
+  install -d $RPM_BUILD_ROOT/%{_datadir}/condor/config.d
   install -m 644 condor-ap/50-gratia-gwms.conf $RPM_BUILD_ROOT/%{_datadir}/condor/config.d/50-gratia-gwms.conf
   install -d $RPM_BUILD_ROOT/%{_sharedstatedir}/condor/gratia/{data,data/quarantine,tmp}
   rm $RPM_BUILD_ROOT%{_datadir}/gratia/condor-ap/50-gratia-gwms.conf
@@ -520,12 +521,15 @@ The dCache storagegroup probe for the Gratia OSG accounting system.
 
 
 %changelog
-* Thu Jan 27 2021 Brian Lin <blin@cs.wisc.edu> - 2.5.0-1
+* Thu Jan 27 2022 Brian Lin <blin@cs.wisc.edu> - 2.5.1-1
+- Fix HTCondor-CE configuration syntax
+
+* Thu Jan 27 2022 Brian Lin <blin@cs.wisc.edu> - 2.5.0-1
 - Fix record generation for HTCondor-CE with HTCondor batch systems
   (SOFTWARE-4978)
 - Remove condor-batch probe (SOFTWARE-4978)
 
-* Wed Jan 26 2021 Brian Lin <blin@cs.wisc.edu> - 2.4.0-1
+* Wed Jan 26 2022 Brian Lin <blin@cs.wisc.edu> - 2.4.0-1
 - Add gratia-probe-condor-batch, formerly gratia-probe-condor (SOFTWARE-4978)
 - Fix ownership of quarantine directories (SOFTWARE-4975)