[openstack-glance/el6-havana] Don't access the net while building docs

[John Bresnahan]

commit e9d3070f0f5f6df4b6f4d5b2355f4ff24f794b7d
Author: John Bresnahan <jbresnah at redhat.com>
Date:   Fri Jun 7 11:34:06 2013 -1000

        Don't access the net while building docs
    
        (Note this hasn't been submitted upstream)

 ...-Don-t-access-the-net-while-building-docs.patch |    6 +-
 Avoid-NULLs-in-crypto-padding.patch                |   47 --------------------
 crypto.random.patch                                |   39 ----------------
 openstack-glance-newdeps.patch                     |   41 -----------------
 openstack-glance.spec                              |   15 +++---
 5 files changed, 10 insertions(+), 138 deletions(-)
---
diff --git a/0001-Don-t-access-the-net-while-building-docs.patch b/0001-Don-t-access-the-net-while-building-docs.patch
index 1b4fb45..7589ab0 100644
--- a/0001-Don-t-access-the-net-while-building-docs.patch
+++ b/0001-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From df7772cffe973b65a717219251ffeb935d10a3fc Mon Sep 17 00:00:00 2001
+From 0ce965b1cca5c5076d60b997f015eaf9b3887634 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Fri, 6 Jan 2012 17:12:54 +0000
 Subject: [PATCH] Don't access the net while building docs
@@ -12,10 +12,10 @@ Change-Id: I42c6e3a5062db209a0abe00cebc04d383c79cbcb
  1 file changed, 1 deletion(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 8b546d6..4d73f0d 100644
+index f926b61..68b9973 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
-@@ -44,7 +44,6 @@ sys.path = [os.path.abspath('../../glance'),
+@@ -44,7 +44,6 @@ sys.path = [
  # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
  extensions = ['sphinx.ext.coverage',
                'sphinx.ext.ifconfig',
diff --git a/openstack-glance.spec b/openstack-glance.spec
index 67bd8e3..ad9906e 100644
--- a/openstack-glance.spec
+++ b/openstack-glance.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-glance
 Version:          2013.2
-Release:          0.2.b%{milestone}%{?dist}
+Release:          0.1.b%{milestone}%{?dist}
 Summary:          OpenStack Image Service
 
 Group:            Applications/System
@@ -23,9 +23,6 @@ Source4:          openstack-glance.logrotate
 Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
 
 # EPEL specific
-Patch100:         openstack-glance-newdeps.patch
-Patch101:         crypto.random.patch
-Patch102:         Avoid-NULLs-in-crypto-padding.patch
 
 BuildArch:        noarch
 BuildRequires:    python2-devel
@@ -110,12 +107,9 @@ This package contains documentation files for glance.
 %prep
 %setup -q -n glance-%{version}.b%{milestone}
 sed -i 's/%{version}.b%{milestone}/%{version}/' PKG-INFO
-
 %patch0001 -p1
 
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
+
 
 # Remove bundled egg-info
 rm -rf glance.egg-info
@@ -294,6 +288,11 @@ fi
 
 %changelog
 * Fri Jun  7 2013 John Bresnahan <jbresnah at redhat.com> 2013.2.b1
+- Don't access the net while building docs
+- (cherry picked from commit f2b4bb4e45afcc178200966193a7b87401c534d7)
+- patch created by pbrady Fri Jan 6 17:12:54 2012 +0000
+
+* Fri Jun  7 2013 John Bresnahan <jbresnah at redhat.com> 2013.2.b1
 - Update to 2013.2.b1
 
 * Mon May 13 2013 Pádraig Brady <P at draigBrady.com> 2013.1-3