[condor] Revert the change on the file 00-personal-condor. Have systemd SIGHUP condor instead of condor_reco

[Brian Bockelman]

commit d06de85976e96b06ff53ad2837bd3db1a8f5c7a6
Author: Brian Bockelman <bbockelm at cse.unl.edu>
Date:   Fri Jun 10 13:59:57 2011 -0500

    Revert the change on the file 00-personal-condor.  Have systemd SIGHUP condor instead of condor_reconfig.

 condor.service |    2 +-
 condor.spec    |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/condor.service b/condor.service
index 920e6a2..88bd34e 100644
--- a/condor.service
+++ b/condor.service
@@ -8,7 +8,7 @@ Wants=network.target
 EnvironmentFile=-/etc/sysconfig/condor
 ExecStart=/usr/sbin/condor_master -f
 ExecStop=/usr/sbin/condor_off -master
-ExecReload=/usr/sbin/condor_reconfig
+ExecReload=/bin/kill -HUP $MAINPID
 Restart=always
 RestartSec=5
 StandardOutput=syslog
diff --git a/condor.spec b/condor.spec
index 78587c4..cd4c09f 100644
--- a/condor.spec
+++ b/condor.spec
@@ -1,7 +1,6 @@
 %define tarball_version 7.6.0
 
 # Things for F15 or later
-# TODO: How do we express "f15 or later?"
 %if 0%{?fedora} >= 15
 # NOTE: Condor+gsoap doesn't work yet on F15; ticket not yet upstream AFAIK.  BB
 %define gsoap 0
@@ -397,7 +396,7 @@ sed -e "s:^LIB\s*=.*:LIB = \$(RELEASE_DIR)/$LIB/condor:" \
 # Install the basic configuration, a Personal Condor config. Allows for
 # yum install condor + service condor start and go.
 mkdir -m0755 %{buildroot}/%{_sysconfdir}/condor/config.d
-cp %{buildroot}/etc/examples/condor_config.local %{buildroot}/%{_sysconfdir}/condor/config.d/00-personal_condor.config
+cp %{buildroot}/etc/examples/condor_config.local %{buildroot}/%{_sysconfdir}/condor/config.d/00personal_condor.config
 
 %if %qmf
 # Install condor-qmf's base plugin configuration