[glusterfs/el6] 3.3.0-4 again

Kaleb S. KEITHLEY kkeithle at fedoraproject.org
Wed Aug 22 18:02:28 UTC 2012


commit 17a996acc6d0a1772f19ff93bb88ba2b78ca6709
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Wed Aug 22 14:01:54 2012 -0400

    3.3.0-4 again

 glusterfs.spec |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
---
diff --git a/glusterfs.spec b/glusterfs.spec
index 551e5fd..835eca3 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -315,8 +315,13 @@ BuildArch:        noarch
 # Required for generating docs
 BuildRequires:    python-eventlet
 BuildRequires:    python-simplejson
+%if ( 0%{?rhel} && 0%{?rhel} < 7 )
+BuildRequires:    python-webob1.0
+BuildRequires:    python-sphinx10
+%else
 BuildRequires:    python-webob
 BuildRequires:    python-sphinx
+%endif
 BuildRequires:    pyxattr
 
 %description swift-doc
@@ -371,7 +376,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 cd swift-%{SWIFTVER}
 %{__python} setup.py build
 %{__mkdir_p} doc/build
+%if ( 0%{?fedora} )
 %{__python} setup.py build_sphinx
+%endif
 cd ..
 
 %install


More information about the scm-commits mailing list