[openstack-glance/el6-grizzly: 2/2] Merge branch 'master' into el6-grizzly

[Pádraig Brady]

commit 2c4cc6514db6090b93f3236bfddd1fa1c9e77531
Merge: 1473158 6bec8b0
Author: Pádraig Brady <P at draigBrady.com>
Date:   Mon Dec 3 17:45:56 2012 +0000

    Merge branch 'master' into el6-grizzly
    
    Conflicts:
    	openstack-glance.spec

 .gitignore                                         |    1 +
 0001-Bump-next-version-to-2012.2.1.patch           |   24 ----
 ...-Don-t-access-the-net-while-building-docs.patch |    2 +-
 ...aultbranch-in-.gitreview-to-stable-folsom.patch |   14 ---
 0003-Pass-empty-args-to-test-config-parser.patch   |   41 -------
 0004-pin-sqlalchemy-to-the-0.7.x-series.patch      |   29 -----
 0005-FakeAuth-not-always-admin.patch               |   42 -------
 0006-Delete-from-store-after-registry-delete.patch |  122 --------------------
 ...-authorization-before-deleting-from-store.patch |   79 -------------
 openstack-glance.spec                              |   32 ++----
 sources                                            |    2 +-
 11 files changed, 12 insertions(+), 376 deletions(-)
---
diff --cc openstack-glance.spec
index a3938ce,a3f9373..f4e2d38
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@@ -9,29 -6,16 +6,22 @@@ Summary:          OpenStack Image Servi
  Group:            Applications/System
  License:          ASL 2.0
  URL:              http://glance.openstack.org
- Source0:          https://launchpad.net/glance/folsom/%{version}/+download/glance-%{version}.tar.gz
+ Source0:          https://launchpad.net/glance/grizzly/grizzly-1/+download/glance-2013.1~g1.tar.gz
 -Source1:          openstack-glance-api.service
 -Source2:          openstack-glance-registry.service
 +Source1:          openstack-glance-api.init
 +Source100:        openstack-glance-api.upstart
 +Source2:          openstack-glance-registry.init
 +Source200:        openstack-glance-registry.upstart
  Source3:          openstack-glance.logrotate
  
  #
- # patches_base=2012.2
+ # patches_base=grizzly-1
  #
- #Patch0001: 0001-Bump-next-version-to-2012.2.1.patch
- #Patch0002: 0002-Set-defaultbranch-in-.gitreview-to-stable-folsom.patch
- #Patch0003: 0003-Pass-empty-args-to-test-config-parser.patch
- #Patch0004: 0004-pin-sqlalchemy-to-the-0.7.x-series.patch
- Patch0005: 0005-FakeAuth-not-always-admin.patch
- Patch0006: 0006-Delete-from-store-after-registry-delete.patch
- Patch0007: 0007-Ensure-authorization-before-deleting-from-store.patch
- Patch0008: 0008-Don-t-access-the-net-while-building-docs.patch
+ Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
  
 +# EPEL specific
 +Patch100:         openstack-glance-newdeps.patch
 +Patch101:         crypto.random.patch
 +
  BuildArch:        noarch
  BuildRequires:    python2-devel
  BuildRequires:    python-setuptools
@@@ -114,18 -97,8 +104,11 @@@ This package contains documentation fil
  %prep
  %setup -q -n glance-%{version}
  
- #%patch0001 -p1
- #%patch0002 -p1
- #%patch0003 -p1
- #%patch0004 -p1
- %patch0005 -p1
- %patch0006 -p1
- %patch0007 -p1
- %patch0008 -p1
+ %patch0001 -p1
  
 +%patch100 -p1
 +%patch101 -p1
 +
  # Remove bundled egg-info
  rm -rf glance.egg-info
  sed -i '/\/usr\/bin\/env python/d' glance/common/config.py glance/common/crypt.py glance/db/sqlalchemy/migrate_repo/manage.py