[euca2ools/el5: 7/7] Merge branch 'master' into el5

[gholms]

commit fc813611d95931fa67ae188ed199ab9ded79eaab
Merge: 1033e55 309bbd6
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Thu Sep 13 21:43:36 2012 -0700

    Merge branch 'master' into el5
    
    Conflicts:
    	euca2ools.spec

 .gitignore                   |    7 +--
 euca2ools-1.3.1-boto20.patch |   49 -----------------------
 euca2ools-1.3.1-euca20.patch |   90 ------------------------------------------
 euca2ools.spec               |   77 +++++++++++++++++++++++-------------
 sources                      |    2 +-
 5 files changed, 53 insertions(+), 172 deletions(-)
---
diff --cc euca2ools.spec
index 8918543,cdae234..62194b7
--- a/euca2ools.spec
+++ b/euca2ools.spec
@@@ -15,34 -9,40 +15,41 @@@ Summary:        Eucalyptus/AWS-compatib
  
  Group:          Applications/Internet
  License:        BSD
- URL:            http://open.eucalyptus.com/
- Source0:        http://eucalyptussoftware.com/downloads/releases/%{name}-%{version}.tar.gz
- # Boto 2.0 compatibility
- Patch20:        euca2ools-1.3.1-boto20.patch
- # https://bugzilla.redhat.com/show_bug.cgi?id=684976
- Patch21:        euca2ools-1.3.1-euca20.patch
+ URL:            http://www.eucalyptus.com/
+ Source0:        http://downloads.eucalyptus.com/software/euca2ools/2.0/source/euca2ools-%{version}.tar.gz
  
 -Requires:       m2crypto
 -Requires:       python-boto >= 2.2
 +Requires:       python%{?__python_ver}-m2crypto
- Requires:       python%{?__python_ver}-boto
++Requires:       python%{?__python_ver}-boto >= 2.2
  Requires:       rsync
  Requires:       util-linux
  
  BuildRequires:  help2man
 -BuildRequires:  python-devel
 -BuildRequires:  python-setuptools-devel
 +BuildRequires:  python%{?__python_ver}-devel
 +BuildRequires:  python%{?__python_ver}-setuptools
  
+ # For building man pages
 -BuildRequires:  python-boto >= 2.0
 -BuildRequires:  m2crypto
++BuildRequires:  python%{?__python_ver}-boto >= 2.0
++BuildRequires:  python%{?__python_ver}-m2crypto
+ 
  BuildArch:      noarch
 +BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
  
  %description
- Eucalyptus is an open source service overlay that implements elastic
- computing using existing resources.  The goal of Eucalyptus is to allow
- sites with existing clusters and server infrastructure to co-host elastic
- computing services that are interface-compatible with Amazon's AWS (EC2,
- S3, EBS).
+ Euca2ools are command line tools used to interact with Eucalyptus,
+ a service overlay designed to be interface-compatible with Amazon Web
+ Services (AWS), as well as AWS itself.
+ 
+ 
+ %package eustore
+ Summary:        Eucalyptus image store command line tools
+ Group:          Applications/Internet
  
- This package contains the command line tools used to interact with
- Eucalyptus.  These tools are also compatible with Amazon AWS.
+ Requires:       %{name} = %{version}-%{release}
+ 
+ 
+ %description eustore
+ EuStore is a service that provides virtual machine images for Eucalyptus
+ clouds.  This package contains command line tools for use with EuStore.
  
  
  %prep