From cfab4655757ff809b14a5a873ae212a71fbc8c86 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:50:19 +0000 Subject: [PATCH 1/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3e5f230..7240e95 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: python-boto -# $Id$ +# $Id: Makefile,v 1.1 2007/08/31 01:21:00 petersen Exp $ NAME := python-boto SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 0fcb47dd2117b2ea5becb9e5b0e0046b0381e395 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 9 Jan 2010 21:48:10 +0000 Subject: [PATCH 2/5] Upgrade to 1.9b --- .cvsignore | 2 +- python-boto.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9ccf292..94ed4e3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -boto-1.8d.tar.gz +boto-1.9b.tar.gz diff --git a/python-boto.spec b/python-boto.spec index 32d7a7e..84af98c 100644 --- a/python-boto.spec +++ b/python-boto.spec @@ -3,7 +3,7 @@ Summary: A simple lightweight interface to Amazon Web Services Name: python-boto -Version: 1.8d +Version: 1.9b Release: 1%{?dist} License: MIT Group: Development/Languages @@ -30,18 +30,25 @@ use, lightweight wrapper around the Amazon services. rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -# Remove all test scripts -rm -rf $RPM_BUILD_ROOT{%{_bindir},%{python_sitelib}/tests} - %clean rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc README +%{_bindir}/elbadmin +%{_bindir}/fetch_file +%{_bindir}/launch_instance +%{_bindir}/list_instances +%{_bindir}/s3put +%{_bindir}/sdbadmin +%{_bindir}/taskadmin %{python_sitelib}/* %changelog +* Sat Jan 09 2010 Robert Scheck 1.9b-1 +- Upgrade to 1.9b + * Fri Jul 24 2009 Robert Scheck 1.8d-1 - Upgrade to 1.8d (#513560) diff --git a/sources b/sources index 622a7e2..15ceac8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3de4ac64015a9b06960fd14827a9c07a boto-1.8d.tar.gz +4fc2fd7b70a971b1363f8465aafe7091 boto-1.9b.tar.gz From 864670cf5d8fd3ed6abcbafd6b65d022d5b43cde Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Tue, 9 Feb 2010 00:42:53 +0000 Subject: [PATCH 3/5] Backported upstream patch for image registration (#561216) --- python-boto-1.9b-image.patch | 42 ++++++++++++++++++++++++++++++++++++ python-boto.spec | 7 +++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 python-boto-1.9b-image.patch diff --git a/python-boto-1.9b-image.patch b/python-boto-1.9b-image.patch new file mode 100644 index 0000000..1c93a77 --- /dev/null +++ b/python-boto-1.9b-image.patch @@ -0,0 +1,42 @@ +Don't require Name param on RegisterImage (even though EC2 docs say it is required) +and change Image to ImageLocation. Fixes issue 323: + + - http://code.google.com/p/boto/issues/detail?id=323 + - http://code.google.com/p/boto/source/detail?r=1448 + +--- boto-1.9b/boto/ec2/connection.py 2009-12-21 14:59:03.000000000 +0100 ++++ boto-1.9b/boto/ec2/connection.py.image 2010-02-09 01:36:11.000000000 +0100 +@@ -176,11 +176,11 @@ + except IndexError: # None of those images available + return None + +- def register_image(self, name, description=None, image_location=None, ++ def register_image(self, name=None, description=None, image_location=None, + architecture=None, kernel_id=None, ramdisk_id=None, + root_device_name=None, block_device_map=None): + """ +- Register an image. ++ Register an image. Valid only for EBS-based images. + + :type name: string + :param name: The name of the AMI. +@@ -210,7 +210,9 @@ + :rtype: string + :return: The new image id + """ +- params = {'Name': name} ++ params = {} ++ if name: ++ params['Name'] = name + if description: + params['Description'] = description + if architecture: +@@ -220,7 +222,7 @@ + if ramdisk_id: + params['RamdiskId'] = ramdisk_id + if image_location: +- params['Location'] = image_location ++ params['ImageLocation'] = image_location + if root_device_name: + params['RootDeviceName'] = root_device_name + if block_device_map: diff --git a/python-boto.spec b/python-boto.spec index 84af98c..b5c8675 100644 --- a/python-boto.spec +++ b/python-boto.spec @@ -4,11 +4,12 @@ Summary: A simple lightweight interface to Amazon Web Services Name: python-boto Version: 1.9b -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Group: Development/Languages URL: http://code.google.com/p/%{pkgname}/ Source: http://boto.googlecode.com/files/%{pkgname}-%{version}.tar.gz +Patch0: python-boto-1.9b-image.patch BuildRequires: python-devel, python-setuptools-devel BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,6 +23,7 @@ use, lightweight wrapper around the Amazon services. %prep %setup -q -n %{pkgname}-%{version} +%patch0 -p1 -b .image %build %{__python} setup.py build @@ -46,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/* %changelog +* Tue Feb 09 2010 Robert Scheck 1.9b-2 +- Backported upstream patch for image registration (#561216) + * Sat Jan 09 2010 Robert Scheck 1.9b-1 - Upgrade to 1.9b From ce45bf78159e37373b824005902ee632fc62df39 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:17:44 +0000 Subject: [PATCH 4/5] Initialize branch EL-6 for python-boto --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From a7289c4b709a230d78dd425622febe1df4b7af16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:13:53 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7240e95..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: python-boto -# $Id: Makefile,v 1.1 2007/08/31 01:21:00 petersen Exp $ -NAME := python-boto -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6