[pytest] Use python-sphinx for rhel > 6 (rhbz#973318).

Thomas Moschny thm at fedoraproject.org
Wed Jun 12 17:15:12 UTC 2013


commit 0560a6d6379569e4d3bb9f45a3f77f8d7b940666
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Wed Jun 12 19:07:07 2013 +0200

    Use python-sphinx for rhel > 6 (rhbz#973318).

 pytest.spec |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/pytest.spec b/pytest.spec
index 1cc2e95..6a22545 100644
--- a/pytest.spec
+++ b/pytest.spec
@@ -24,7 +24,7 @@ BuildRequires:  python-setuptools
 Requires:       python-setuptools
 BuildRequires:  python-py >= %{pylib_version}
 Requires:       python-py >= %{pylib_version}
-%if 0%{?fedora}
+%if 0%{?rhel} > 6 || 0%{?fedora}
 BuildRequires:  python-sphinx
 %else
 BuildRequires:  python-sphinx10
@@ -78,7 +78,7 @@ cp -a . %{py3dir}
 %build
 %{__python} setup.py build
 
-%if 0%{?fedora}
+%if 0%{?rhel} > 6 || 0%{?fedora}
 for l in doc/* ; do
   make -C $l html PYTHONPATH=$(pwd)
 done
@@ -165,6 +165,7 @@ popd
 
 %changelog
 * Wed Jun 12 2013 Thomas Moschny <thomas.moschny at gmx.de> - 2.3.5-2
+- Use python-sphinx for rhel > 6 (rhbz#973318).
 - Update BR to use python-pexpect instead of pexpect.
 
 * Sat May 25 2013 Thomas Moschny <thomas.moschny at gmx.de> - 2.3.5-1


More information about the scm-commits mailing list