public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Thomas Moschny <thm@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/python-py] pr7: Add conditional for sphinx on rhel.
Date: Sat, 01 Aug 2026 11:43:02 GMT [thread overview]
Message-ID: <178558458202.1.1456384102252240185.rpms-python-py-2ea0b859817d@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/python-py
Branch : pr7
Commit : 2ea0b859817d73676ccca3c64883c3ae79ce41e6
Author : Thomas Moschny <thm@fedoraproject.org>
Date : 2012-10-12T00:45:25+02:00
Stats : +18/-4 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/python-py/c/2ea0b859817d73676ccca3c64883c3ae79ce41e6?branch=pr7
Log:
Add conditional for sphinx on rhel.
- Remove rhel logic from with_python3 conditional.
---
diff --git a/python-py.spec b/python-py.spec
index b3e89ab..e157e0f 100644
--- a/python-py.spec
+++ b/python-py.spec
@@ -1,19 +1,21 @@
-%if (! 0%{?rhel}) || 0%{?rhel} > 6
+%if 0%{?fedora} > 12
%global with_python3 1
%global python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])")
%endif
+%if 0%{?rhel} && 0%{?rhel} < 6
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%endif
# we have a circular (build) dependency with the (new) pytest package
# when generating the docs or running the testsuite
-%global with_docs 1
-%global run_check 1
+%global with_docs 0
+%global run_check 0
%global pytest_version 2.2.4
Name: python-py
Version: 1.4.9
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Library with cross-python path, ini-parsing, io, code, log facilities
Group: Development/Languages
License: MIT and Public Domain
@@ -26,7 +28,11 @@ BuildRequires: python-devel
BuildRequires: python-setuptools
Requires: python-setuptools
%if 0%{?with_docs}
+%if 0%{?fedora}
BuildRequires: python-sphinx
+%else
+BuildRequires: python-sphinx10
+%endif # fedora
%endif # with_docs
%if 0%{?run_check}
BuildRequires: pytest >= %{pytest_version}
@@ -87,7 +93,11 @@ cp -a . %{py3dir}
%{__python} setup.py build
%if 0%{?with_docs}
+%if 0%{?fedora}
make -C doc html PYTHONPATH=$(pwd)
+%else
+make -C doc html SPHINXBUILD=sphinx-1.0-build PYTHONPATH=$(pwd)
+%endif # fedora
%endif # with_docs
%if 0%{?with_python3}
@@ -146,6 +156,10 @@ rm -rf %{buildroot}
%changelog
+* Thu Oct 11 2012 Thomas Moschny <thomas.moschny@gmx.de> - 1.4.9-7
+- Add conditional for sphinx on rhel.
+- Remove rhel logic from with_python3 conditional.
+
* Wed Oct 10 2012 Thomas Moschny <thomas.moschny@gmx.de> - 1.4.9-6
- Re-enable doc building and testsuite.
reply other threads:[~2026-08-01 11:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178558458202.1.1456384102252240185.rpms-python-py-2ea0b859817d@fedoraproject.org \
--to=thm@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox