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

[gholms]

commit 1033e5582f0f18881408be48deef6c24b7fbec66
Merge: 7b3c0e6 f028fc5
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue Apr 17 17:27:50 2012 -0700

    Merge branch 'el6' into el5

 .gitignore                             |    1 +
 euca2ools-1.3.1-describe-all.patch     |   82 ----------------
 euca2ools-1.3.1-download-usage.patch   |   16 ---
 euca2ools-1.3.1-ebsreg.patch           |   81 ----------------
 euca2ools-1.3.1-ec2cert.patch          |   15 ---
 euca2ools-1.3.1-emptyblock.patch       |   16 ---
 euca2ools-1.3.1-fsid.patch             |  160 --------------------------------
 euca2ools-1.3.1-imageattr-ptr.patch    |   14 ---
 euca2ools-1.3.1-inv-user.patch         |   43 ---------
 euca2ools-1.3.1-kernel.patch           |   15 ---
 euca2ools-1.3.1-key-doc.patch          |   20 ----
 euca2ools-1.3.1-mkfsopt.patch          |   29 ------
 euca2ools-1.3.1-rs.patch               |   22 -----
 euca2ools-1.3.1-shasum.patch           |  134 --------------------------
 euca2ools-1.3.1-smallbundle.patch      |   17 ----
 euca2ools-1.3.1-space.patch            |  106 ---------------------
 euca2ools-1.3.1-srcnet.patch           |   22 -----
 euca2ools-1.3.1-strlen.patch           |   17 ----
 euca2ools-1.3.1-symlink.patch          |   11 --
 euca2ools-1.3.1-udev-persistence.patch |   22 -----
 euca2ools-1.3.1-uploadloc.patch        |   70 --------------
 euca2ools-1.3.1-uriparse.patch         |   91 ------------------
 euca2ools-1.3.1-userdash.patch         |   59 ------------
 euca2ools-1.3.1-userdata.patch         |   12 ---
 euca2ools-1.3.1-userint.patch          |   49 ----------
 euca2ools-1.3.1-valid.patch            |   23 -----
 euca2ools.spec                         |   90 ++----------------
 sources                                |    2 +-
 28 files changed, 11 insertions(+), 1228 deletions(-)
---
diff --cc euca2ools.spec
index 9ce3b05,7f96862..8918543
--- a/euca2ools.spec
+++ b/euca2ools.spec
@@@ -60,23 -15,9 +21,9 @@@ Source0:        http://eucalyptussoftwa
  Patch20:        euca2ools-1.3.1-boto20.patch
  # https://bugzilla.redhat.com/show_bug.cgi?id=684976
  Patch21:        euca2ools-1.3.1-euca20.patch
- # https://bugs.launchpad.net/euca2ools/+bug/760157
- 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