[euca2ools/el5: 6/7] Upstream update (2.1.1)

[gholms]

commit 309bbd603d00d2ccd6301bc7d64dc3a981912f60
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Jul 13 13:23:21 2012 -0700

    Upstream update (2.1.1)

 euca2ools.spec |   49 ++++++++++++++++++++++++++++++++++++-------------
 sources        |    2 +-
 2 files changed, 37 insertions(+), 14 deletions(-)
---
diff --git a/euca2ools.spec b/euca2ools.spec
index 7b4e0e5..cdae234 100644
--- a/euca2ools.spec
+++ b/euca2ools.spec
@@ -3,9 +3,9 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:           euca2ools
-Version:        2.0.2
-Release:        2%{?dist}
-Summary:        Elastic Utility Computing Architecture Command-Line Tools
+Version:        2.1.1
+Release:        1%{?dist}
+Summary:        Eucalyptus/AWS-compatible command line tools
 
 Group:          Applications/Internet
 License:        BSD
@@ -21,17 +21,28 @@ BuildRequires:  help2man
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 
+# For building man pages
+BuildRequires:  python-boto >= 2.0
+BuildRequires:  m2crypto
+
 BuildArch:      noarch
 
 %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, IAM).
+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
+
+Requires:       %{name} = %{version}-%{release}
 
-This package contains the command line tools used to interact with
-Eucalyptus.  These tools are also compatible with Amazon AWS.
+
+%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
@@ -40,14 +51,17 @@ Eucalyptus.  These tools are also compatible with Amazon AWS.
 
 %build
 %{__python} setup.py build
+export PYTHON=%{__python}
+sh -xe generate-manpages.sh
 
 
 %install
 %{__python} setup.py install --skip-build --root %{buildroot}
 %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
-mkdir -p %{buildroot}/%{_mandir}/man1
-cp -p man/* %{buildroot}/%{_mandir}/man1
+export DESTDIR=%{buildroot}
+export PREFIX=%{_prefix}
+sh -xe install-manpages.sh
 
 
 %clean
@@ -55,7 +69,6 @@ rm -rf %{buildroot}
 
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/euca-*
 %{_bindir}/euare-*
 %{_mandir}/man1/euca*
@@ -67,7 +80,17 @@ rm -rf %{buildroot}
 %doc INSTALL
 %doc README
 
+
+%files eustore
+%{_bindir}/eustore-*
+%{_mandir}/man1/eustore*
+
+
 %changelog
+* Wed Sep 13 2012 Garrett Holmstrom <gholms at fedoraproject.org> - 2.1.1-1
+- Upstream update (2.1.1)
+- The new EuStore tools introduced in this version are in the -eustore package.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 86ec1f3..72b82d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-280106f9125b3f0c8456baaf5df3840a  euca2ools-2.0.2.tar.gz
+c38c4195ae7a6fc1c0d5b3bd8ded39e1  euca2ools-2.1.1.tar.gz