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

[gholms]

commit 7b3c0e659e35bf68395dc9f42be7c13eef8adfb7
Merge: 2a90edc 0e7f3c5
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue Jul 26 18:06:16 2011 -0700

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

 euca2ools-1.3.1-ebsreg.patch        |   81 +++++++++++++++++++++++++++++++++++
 euca2ools-1.3.1-emptyblock.patch    |   16 +++++++
 euca2ools-1.3.1-imageattr-ptr.patch |   14 ++++++
 euca2ools-1.3.1-uploadloc.patch     |   70 ++++++++++++++++++++++++++++++
 euca2ools.spec                      |   28 ++++++++++++-
 5 files changed, 208 insertions(+), 1 deletions(-)
---
diff --cc euca2ools.spec
index 526d558,1f8be6e..9ce3b05
--- a/euca2ools.spec
+++ b/euca2ools.spec
@@@ -1,9 -1,5 +1,11 @@@
+ # Spec file license: MIT
+ 
 +# Use Python 2.6
 +%global pybasever 2.6
 +%global __python_ver 26
 +%global __python %{_bindir}/python%{?pybasever}
 +%global __os_install_post %{?__multiple_python_os_install_post}
 +
  %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
  
  Name:           euca2ools
@@@ -62,9 -58,19 +64,19 @@@ Patch21:        euca2ools-1.3.1-euca20.
  Patch22:        euca2ools-1.3.1-smallbundle.patch
  # https://bugs.launchpad.net/euca2ools/+bug/771498
  Patch23:        euca2ools-1.3.1-mkfsopt.patch
+ # (upstream bzr revision 424)
+ Patch24:        euca2ools-1.3.1-emptyblock.patch
+ # https://bugs.launchpad.net/euca2ools/+bug/795395
+ Patch25:        euca2ools-1.3.1-imageattr-ptr.patch
+ # https://bugs.launchpad.net/euca2ools/+bug/704658
+ # Patch is based on upstream bzr rev 443
+ Patch26:        euca2ools-1.3.1-uploadloc.patch
+ # Allow boot-from-EBS image registration
+ # Patch is based on upstream bzr rev 416
+ Patch27:        euca2ools-1.3.1-ebsreg.patch
  
 -Requires:       m2crypto
 -Requires:       python-boto
 +Requires:       python%{?__python_ver}-m2crypto
 +Requires:       python%{?__python_ver}-boto
  Requires:       rsync
  Requires:       util-linux