[openstack-glance/el6: 4/4] Merge branch 'f18' into el6

[Pádraig Brady]

commit d62932515c86f620cea7d8a1aa74a162399c669f
Merge: cfab858 e42c68d
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Feb 1 17:23:27 2013 +0000

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

 .gitignore                                         |    1 +
 ...-Don-t-access-the-net-while-building-docs.patch |    6 +++---
 openstack-glance.spec                              |   10 ++++++----
 sources                                            |    2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)
---
diff --cc openstack-glance.spec
index 57b0c96,b2a4b6a..dcee2f9
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@@ -17,15 -15,10 +17,14 @@@ Source200:        openstack-glance-regi
  Source3:          openstack-glance.logrotate
  
  #
- # patches_base=2012.2.1
+ # patches_base=2012.2.3
  #
  Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
- Patch0002: 0002-Backend_password_leak_in_Glance_error_message.patch
  
 +# EPEL specific
 +Patch100:         openstack-glance-newdeps.patch
 +Patch101:         crypto.random.patch
 +
  BuildArch:        noarch
  BuildRequires:    python2-devel
  BuildRequires:    python-setuptools