[openstack-nova] ensure we don't access the net when building a package

Pádraig Brady pbrady at fedoraproject.org
Thu Dec 1 17:47:21 UTC 2011


commit 4046a2d559e4a9bca9da7f67bb3a5ba85b154b12
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Dec 1 17:19:28 2011 +0000

    ensure we don't access the net when building a package
    
    This shouldn't be an issue but it's bad practise,
    which may be prohibited or cause build issues in future

 openstack-nova-nonet.patch |   11 +++++++++++
 openstack-nova.spec        |    7 +++++++
 2 files changed, 18 insertions(+), 0 deletions(-)
---
diff --git a/openstack-nova-nonet.patch b/openstack-nova-nonet.patch
new file mode 100644
index 0000000..3aceb26
--- /dev/null
+++ b/openstack-nova-nonet.patch
@@ -0,0 +1,11 @@
+--- nova-2011.3.orig/doc/source/conf.py	2011-09-22 13:02:23.000000000 +0100
++++ nova-2011.3/doc/source/conf.py	2011-11-24 13:04:22.578487419 +0000
+@@ -25,7 +25,7 @@
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ 
+-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'ext.nova_todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig','sphinx.ext.graphviz']
++extensions = ['sphinx.ext.autodoc', 'ext.nova_todo', 'sphinx.ext.coverage', 'sphinx.ext.pngmath', 'sphinx.ext.ifconfig','sphinx.ext.graphviz']
+ 
+ # autodoc generation is a bit aggressive and a nuisance when doing heavy text edit cycles.
+ # execute "export SPHINX_DEBUG=1" in your terminal to disable
diff --git a/openstack-nova.spec b/openstack-nova.spec
index cbe0404..72bcd08 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -75,6 +75,9 @@ Patch38:          0038-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patc
 Patch39:          0039-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
 Patch40:          0040-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
 
+# These are fedora specific
+Patch100:         openstack-nova-nonet.patch
+
 BuildArch:        noarch
 BuildRequires:    intltool
 BuildRequires:    python-setuptools
@@ -246,6 +249,9 @@ This package contains documentation files for nova.
 %patch39 -p1
 %patch40 -p1
 
+# apply local patches
+%patch100 -p1
+
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
 find nova -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
@@ -429,6 +435,7 @@ fi
 %changelog
 * Tue Nov 22 2011 Pádraig Brady <P at draigBrady.com> - 2011.3-9
 - Update the libvirt dependency from 0.8.2 to 0.8.7
+- Ensure we don't access the net when building docs
 
 * Tue Nov 29 2011 Russell Bryant <rbryant at redhat.com> - 2011.3-8
 - Change default database to mysql. (#735012)


More information about the scm-commits mailing list