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

[rrati]

commit 3747f0370b71560b25cb6ba83fb2ce8b86a9d636
Author: Robert Rati <rrati at redhat.com>
Date:   Mon Jan 3 13:45:25 2011 -0600

    Updated to upstream version 1.1

 .gitignore                     |    1 +
 condor-ec2-enhanced-hooks.spec |   60 ++++++++++++++++++++++++---------------
 sources                        |    2 +-
 3 files changed, 39 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fba9f14..fda03c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 condor-ec2-enhanced-hooks-1.0-19.tar.gz
+/condor-ec2-enhanced-hooks-1.1-2.tar.gz
diff --git a/condor-ec2-enhanced-hooks.spec b/condor-ec2-enhanced-hooks.spec
index 3b32fd0..9b028ac 100644
--- a/condor-ec2-enhanced-hooks.spec
+++ b/condor-ec2-enhanced-hooks.spec
@@ -1,30 +1,27 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%define rel 19
+%define rel 2
 
 Summary: Condor EC2 Enhanced hooks
 Name: condor-ec2-enhanced-hooks
-Version: 1.0
-Release: %{rel}.1%{?dist}
+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.3
 Requires: condor >= 7.2.0-4
-Requires: python-condor-job-hooks-common >= 1.0-4
-Requires: python-%{name}-common
+Requires: python-condorutils >= 1.4
+Requires: python-condorec2e >= 1.1
 Requires: python-boto >= 1.7a
 Requires: openssl
 
 %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 provides Condor job router hooks that will translate a job into
@@ -32,15 +29,16 @@ a Condor EC2 job and monitor the state of that job.  This should be installed
 on condor nodes that will submitting work and wish to use the EC2 Enhanced
 feature.
 
-%package -n python-%{name}-common
-Summary: Common functions/utilities for condor job hooks
+%package -n python-condorec2e
+Summary: Common definitions for EC2 Enhanced
 Group: Applications/System
 BuildRequires: python-devel
 Requires: python >= 2.3
 Obsoletes: condor-ec2-enhanced-hooks-common
+Obsoletes: python-condor-ec2-enhanced-hooks-common
 
-%description -n python-%{name}-common
-Common functions and utilities used by MRG condor job hooks.
+%description -n python-condorec2e
+Common definitions used by condor's EC2 Enhanced functionality
 
 %prep
 %setup -q
@@ -50,12 +48,12 @@ Common functions and utilities used by MRG condor job hooks.
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/%_libexecdir/condor/hooks
-mkdir -p %{buildroot}/%{python_sitelib}/ec2enhanced
+mkdir -p %{buildroot}/%{python_sitelib}/condorec2e
 mkdir -p %{_builddir}/%{name}-%{version}/example
 cp -f hook*.py %{buildroot}/%_libexecdir/condor/hooks
-cp -f functions.py %{buildroot}/%{python_sitelib}/ec2enhanced
+cp -f sqs.py %{buildroot}/%{python_sitelib}/condorec2e
 cp -f config/condor_config.example %{_builddir}/%{name}-%{version}/example
-touch %{buildroot}/%{python_sitelib}/ec2enhanced/__init__.py
+touch %{buildroot}/%{python_sitelib}/condorec2e/__init__.py
 
 %clean
 rm -rf %{buildroot}
@@ -69,15 +67,31 @@ rm -rf %{buildroot}
 %_libexecdir/condor/hooks/hook_cleanup.py*
 %_libexecdir/condor/hooks/hook_retrieve_status.py*
 
-%files -n python-%{name}-common
+%files -n python-condorec2e
 %defattr(-,root,root,-)
 %doc LICENSE-2.0.txt
-%{python_sitelib}/ec2enhanced/functions.py*
-%{python_sitelib}/ec2enhanced/__init__.py*
+%{python_sitelib}/condorec2e/__init__.py*
+%{python_sitelib}/condorec2e/sqs.py*
 
 %changelog
-* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 1.0-19.1
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+* Mon Jan  3 2011  <rrati at redhat> - 1.1-2
+- Updated source URL
+- Remove mention of EC2E_HOOK params from the example config file
+
+* Mon Jun 28 2010  <rrati at redhat> - 1.1-1
+- Added versions on deps for python-ec2e and python-condorutils
+- Fixed description (standard -> vanilla)
+- Typo fixes
+
+* Fri Jun 11 2010  <rrati at redhat> - 1.1-0.2
+- Logging is to stderr only
+
+* 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
+- Added 2 params for controlling log files
+- Renamed functions module to sqs
 
 * Tue Aug 18 2009  <rrati at redhat> - 1.0-19
 - Split the documentation into two files, one for the AMI and one for
diff --git a/sources b/sources
index 907b0bc..fe9ea26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-40f9205f907e8f03c59743170fbbc0eb  condor-ec2-enhanced-hooks-1.0-19.tar.gz
+93969b12738c162ac6faa33dd467f773  condor-ec2-enhanced-hooks-1.1-2.tar.gz