[condor-ec2-enhanced] Updated to upstream version 1.1

[rrati]

commit 146071ec125290ea6818c1f634d56bfe2619ddfc
Author: Robert Rati <rrati at redhat.com>
Date:   Mon Jan 3 13:35:52 2011 -0600

    Updated to upstream version 1.1

 .gitignore               |    1 +
 condor-ec2-enhanced.spec |   44 ++++++++++++++++++++++++++++++--------------
 sources                  |    2 +-
 3 files changed, 32 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0b212bc..472cd54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 condor-ec2-enhanced-1.0-17.tar.gz
+/condor-ec2-enhanced-1.1-2.tar.gz
diff --git a/condor-ec2-enhanced.spec b/condor-ec2-enhanced.spec
index aca9391..6135950 100644
--- a/condor-ec2-enhanced.spec
+++ b/condor-ec2-enhanced.spec
@@ -1,32 +1,28 @@
 %{!?is_fedora: %define is_fedora %(/bin/sh -c "if [ -e /etc/fedora-release ];then echo '1'; fi")}
-%define rel 17
+%define rel 2
 
 Summary: EC2 Enhanced
 Name: condor-ec2-enhanced
-Version: 1.0
+Version: 1.1
 Release: %{rel}%{?dist}
 License: ASL 2.0
 Group: Applications/System
-URL: http://www.redhat.com/mrg
-# This is a Red Hat maintained package which is specific to
-# our distribution.  Thus the source is only available from
-# within this srpm.
+URL: http://git.fedorahosted.org/git/grid/caroniad.git
 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-job-hooks
-Requires: python-condor-job-hooks-common
-Requires: python-condor-ec2-enhanced-hooks-common
+Requires: python-condorutils >= 1.4
+Requires: python-condorec2e >= 1.1
 Requires: python-boto >= 1.7a
 Requires: openssl
-Conflicts: condor-low-latency
 
 %description
 The EC2 Enhanced feature allows for near seamless translation of Condor jobs
-in the standard universe to condor EC2 jobs in the grid universe.  For all
-intents and purposes, the job runs as any standard universe job runs except
+in the vanilla universe to condor EC2 jobs in the grid universe.  For all
+intents and purposes, the job runs as any vanilla universe job runs except
 on an Amazon EC2 AMI instance.
 
 This package contains the daemon that handles the communication between
@@ -42,9 +38,7 @@ feature.
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}/%{_sysconfdir}/condor
 cp -f caroniad %{buildroot}/%_sbindir
-cp -f config/caroniad.conf %{buildroot}/%{_sysconfdir}/condor
 
 %clean
 rm -rf %{buildroot}
@@ -61,11 +55,33 @@ exit 0
 %files
 %defattr(-,root,root,-)
 %doc LICENSE-2.0.txt INSTALL
-%config(noreplace) %_sysconfdir/condor/caroniad.conf
 %defattr(0755,root,root,-)
 %_sbindir/caroniad
 
 %changelog
+* Mon Jan  3 2011  <rrati at redhat> - 1.1-2
+- Updated source URL
+
+* Mon Jun 28 2010  <rrati at redhat> - 1.1-1
+- Added versions on deps for python-ec2e and python-condorutils
+- Fixed description (standard -> vanilla)
+
+* Fri Jun 11 2010  <rrati at redhat> - 1.1-0.2
+- Additional logging
+- Additional signal handling
+
+* Tue Mar 30 2010  <rrati at redhat> - 1.1-0.1
+- Updated INSTALL docs
+- Changed to using condorutils and condorec2e modules
+- Use log logging call install of syslog
+- Renamed exceptions and define locally instead of relying on definition
+  in condorutils
+- Code cleanup
+- Added 2 params for controlling log files
+
+* Fri Oct 23 2009  <rrati at redhat> - 1.0-18
+- Removed conflict with condor-low-latency
+
 * Tue Aug 18 2009  <rrati at redhat> - 1.0-17
 - caroniad checks condor_config for its configuration before looking
   in configuration files
diff --git a/sources b/sources
index dc2805b..e778e4e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e46a92c91f052c05b826bd2b5908d1a2  condor-ec2-enhanced-1.0-17.tar.gz
+429c2c7b93989a8902fe0170e18d909c  condor-ec2-enhanced-1.1-2.tar.gz