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

[gholms]

commit 39f87b54364e1265f3f753b4f907a05816a65af1
Merge: 5471067 b84a795
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Mon Mar 4 16:27:08 2013 -0800

    Merge branch 'master' into el5

 euca2ools-2.1.3-useraddpol-delegate.patch |   22 ++++++++++++++++++++++
 euca2ools.spec                            |   16 ++++++++++++++--
 sources                                   |    2 +-
 3 files changed, 37 insertions(+), 3 deletions(-)
---
diff --cc euca2ools.spec
index 5ce4f09,4353030..c404160
--- a/euca2ools.spec
+++ b/euca2ools.spec
@@@ -27,16 -21,19 +27,20 @@@ Obsoletes:      euca2ools-eustore < 2.1
  Provides:       euca2ools-eustore = %{version}-%{release}
  
  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)
  
+ # https://eucalyptus.atlassian.net/browse/TOOLS-274
+ Patch1:         euca2ools-2.1.3-useraddpol-delegate.patch
+ 
+ 
  %description
  Euca2ools are command line tools used to interact with Eucalyptus,
  a service overlay designed to be interface-compatible with Amazon Web