[condor-ec2-enhanced] Update to upstream version 1.2

[rrati]

commit fa0a5a88d1920e3bb60e60c7c3206460aded5278
Author: Robert Rati <rrati at redhat.com>
Date:   Tue Jul 5 11:35:44 2011 -0500

    Update to upstream version 1.2

 .gitignore               |    1 +
 condor-ec2-enhanced.spec |   14 +++++++++++---
 sources                  |    2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 38c22c6..b7fb0e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 condor-ec2-enhanced-1.0-17.tar.gz
 /condor-ec2-enhanced-1.1-2.tar.gz
 /condor-ec2-enhanced-1.1-3.tar.gz
+/condor-ec2-enhanced-1.2-1.tar.gz
diff --git a/condor-ec2-enhanced.spec b/condor-ec2-enhanced.spec
index b874e29..6f5f76f 100644
--- a/condor-ec2-enhanced.spec
+++ b/condor-ec2-enhanced.spec
@@ -1,9 +1,9 @@
 %{!?is_fedora: %define is_fedora %(/bin/sh -c "if [ -e /etc/fedora-release ];then echo '1'; fi")}
-%define rel 3
+%define rel 1
 
 Summary: EC2 Enhanced
 Name: condor-ec2-enhanced
-Version: 1.1
+Version: 1.2
 Release: %{rel}%{?dist}
 License: ASL 2.0
 Group: Applications/System
@@ -12,7 +12,7 @@ Source0: %{name}-%{version}-%{rel}.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch: noarch
 Requires: python >= 2.4
-Requires: condor >= 7.0.2-4
+Requires: condor >= 7.4.4-0.9
 Requires: condor-job-hooks
 Requires: python-condorutils >= 1.5
 Requires: python-condorec2e >= 1.1
@@ -38,7 +38,9 @@ feature.
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}/%_sysconfdir/condor/config.d
 cp -f caroniad %{buildroot}/%_sbindir
+cp -f config/60condor-ec2e.config %{buildroot}/%_sysconfdir/condor/config.d
 
 %clean
 rm -rf %{buildroot}
@@ -55,10 +57,16 @@ exit 0
 %files
 %defattr(-,root,root,-)
 %doc LICENSE-2.0.txt INSTALL
+%_sysconfdir/condor/config.d/60condor-ec2e.config
 %defattr(0755,root,root,-)
 %_sbindir/caroniad
 
 %changelog
+* Wed Jun 29 2011  <rrati at redhat> - 1.2-1
+- Install config file into /etc/condor/config.d
+- Changed daemon name in config to CARONIAD, old name still supported
+- Updated docs
+
 * Mon Feb  8 2011  <rrati at redhat> - 1.1-3
 - Updated dep on python-condorutils
 
diff --git a/sources b/sources
index 86f3587..c64fbbf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-410864a7074d3fb88b83ad68ba18153c  condor-ec2-enhanced-1.1-3.tar.gz
+f1e65702b7955f8edc25a3421fb2b63d  condor-ec2-enhanced-1.2-1.tar.gz