Compare commits

...

130 Commits
f24 ... f39

Author SHA1 Message Date
Miro Hrončok
cd973c604c Don't use filelock to test this package on RHEL 2023-07-27 10:36:15 +02:00
Fedora Release Engineering
d36e4d737b Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-21 14:14:17 +00:00
Karolina Surma
f907d7218a Modernize %bconds 2023-07-14 10:30:30 +02:00
Karolina Surma
0896827c70 Don't use sphinxcontrib-websupport to build the documentation on RHEL 2023-07-14 09:16:07 +02:00
Karolina Surma
d236f3e2ec Use the correct SPDX tag for -doc subpackage's license 2023-06-26 19:11:21 +02:00
Karolina Surma
43d6afce76 Update to 6.2.1 2023-06-26 19:08:51 +02:00
Python Maint
44a9235d5a Rebuilt for Python 3.12 2023-06-16 08:19:41 +02:00
Python Maint
4b48db9c79 Bootstrap for Python 3.12 2023-06-14 00:24:40 +02:00
Yaakov Selkowitz
5311862e59 Avoid html5lib test dependency in RHEL builds
python-html5lib is unwanted in RHEL.
2023-05-31 03:09:02 -04:00
Karolina Surma
fd31a7629c Stop enumerating sources and patches 2023-03-17 08:55:12 +01:00
Karolina Surma
e46bed5658 Undefine dedicated macro %_py3_shebang_s
It is more readable and less magical.
2023-03-17 08:49:27 +01:00
Karolina Surma
fa49ab85f0 Convert license to SPDX tag 2023-03-09 14:10:10 +01:00
Karolina Surma
9a29732cf9 Update to 6.1.3 2023-03-09 14:09:19 +01:00
Karolina Surma
84bf048c91 Fix test failures
- fix test failures related to Babel 2.12
- remove the tests that required setuptools in the environment
2023-03-09 09:55:07 +01:00
Karolina Surma
a31453064c Fix tests failures with Pygments 2.14 2023-01-31 16:26:54 +01:00
Fedora Release Engineering
7507893559 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-20 17:26:13 +00:00
Karolina Surma
d24b3b01a9 Update to 5.3.0 2022-11-16 16:54:32 +01:00
Karolina Surma
9c0d32b9af Remove duplicate files from the built documentation 2022-08-22 14:46:37 +02:00
Karolina Surma
9104ffe553 Remove reST docs from the -doc package, ship only HTML 2022-08-22 13:56:02 +02:00
Karolina Surma
2da599dd9a Update to 5.1.1 2022-08-17 10:12:09 +02:00
Fedora Release Engineering
2fbf62bfba Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-22 22:27:44 +00:00
Karolina Surma
a0cc515b74 Update to 5.0.2 2022-06-30 10:49:45 +02:00
Python Maint
0b87836124 Rebuilt for Python 3.11 2022-06-13 21:14:17 +02:00
Python Maint
be9e7b1508 Bootstrap for Python 3.11 2022-06-13 18:04:49 +02:00
Karolina Surma
81f3c96c10 Update to 4.5.0 2022-04-20 11:25:50 +02:00
Miro Hrončok
055cf1292a Prepare spec for multiple flags in %py3_shebang_flags
See the relevant change of packaging guidelines:
https://pagure.io/packaging-committee/pull-request/1165

tl;dr If we ever add more flags, we want to remove s here, not all flags.
2022-03-23 12:31:47 +01:00
Karolina Surma
b0978bafd9 Update to 4.4.0 2022-02-11 16:46:34 +01:00
Charalampos Stratakis
ca6027ecf0 Add rpminspect file 2022-02-01 20:24:33 +01:00
Fedora Release Engineering
7dfe865724 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-21 15:38:10 +00:00
Karolina Surma
644aef964c Update to 4.3.1 2021-11-29 16:56:13 +01:00
Karolina Surma
2e80cab0b5 Update to 4.3.0 2021-11-19 15:38:40 +01:00
Karolina Surma
8aeee581aa Update to 4.2.0 2021-09-22 12:18:33 +02:00
Karolina Surma
9dc09b9e79 Enable one of previously deselected tests 2021-09-22 12:13:12 +02:00
Karolina Surma
f0f09a5087 Backport bugfixes from upstream 4.1.x branch for compatibility with Python 3.10-rc2 2021-09-22 12:12:55 +02:00
Karolina Surma
cc7f8dfbf3 Fix tests with python-pygments >= 2.10 2021-08-18 12:39:04 +02:00
Karolina Surma
924f1b1e38 Backport a patch to make python-sphinx work with Python 3.10-rc1
types.Union was renamed to types.UnionType, causing Sphinx to crash
2021-08-04 09:56:40 +02:00
Karolina Surma
0453f9e3b7 Update to 4.1.2 2021-08-03 13:53:33 +02:00
Fedora Release Engineering
eb75429039 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 09:36:24 +00:00
Karolina Surma
d76c73ce9e Update to 4.0.2 2021-06-11 13:25:22 +02:00
Python Maint
04e7c13b7b Rebuilt for Python 3.10 2021-06-03 13:18:32 +02:00
Python Maint
1376b3f859 Bootstrap for Python 3.10 2021-06-02 19:11:49 +02:00
Miro Hrončok
25af7978b4 Temporarily skip test_signature_annotations to unblock Python 3.10 rebuild 2021-05-11 10:36:13 +02:00
Karolina Surma
2fb9084204 Update to 3.5.4 2021-05-10 16:19:46 +02:00
Tomas Hrnciar
12770577f7 Enable runtime dependencies when built without tests
Runtime dependencies are currently brought in only when built with tests
as a part of -x option of %pyproject_buildrequires. But they are also needed
when building without tests, because in-tree sphinx is used to build
the documentation.
2021-04-21 12:46:16 +02:00
Karolina Surma
4459819cfc Update to 3.5.3 2021-04-01 10:30:34 +02:00
Charalampos Stratakis
5c12b53641 Update to 3.5.2 2021-03-10 20:26:20 +01:00
Fedora Release Engineering
f7572144d2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 13:30:25 +00:00
Charalampos Stratakis
4500554943 Update to 3.4.3 2021-01-19 12:47:35 +00:00
Tom Stellard
82817e3a80 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-08 20:01:30 +00:00
Mattia Verga
daad1311b1 Unset -s from python shebang 2020-12-08 11:07:38 +01:00
Miro Hrončok
67bdc19f10 Convert to pyproject macros
This adds an (optional) test dependency on Cython + gcc.
This removes an unused dependency on mock.

Not using %{pyproject_files} because the %install section is a mess.
2020-11-24 21:00:32 +01:00
Miro Hrončok
bcde98f61b Remove old Obsoletes, Provides and Conflicts 2020-11-24 21:00:32 +01:00
Miro Hrončok
9e608a0fa5 Update to 3.3.1 2020-11-23 21:38:34 +01:00
Tomas Hrnciar
976a71363d Backport commit to fix sphinx with latest version of pygments 2020-10-14 10:09:07 +02:00
Miro Hrončok
5bf9c06479 Update to 3.2.1
- Remove compatibility symbolic links from /usr/libexec/
- Use %pytest
2020-08-18 13:30:22 +02:00
Frédéric Pierret (fepitre)
884ff2afc1 spec: replace hardcoded python3
Signed-off-by: Frédéric Pierret (fepitre) <frederic.pierret@qubes-os.org>
2020-08-10 15:26:10 +00:00
Miro Hrončok
1d11fd11e2 Update to 3.1.2
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1853901
2020-08-08 02:03:30 +02:00
Fedora Release Engineering
39005de2f4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 03:58:57 +00:00
Miro Hrončok
686ccb777b Fix e-mail address in changelog 2020-06-30 18:28:53 +02:00
Charalampos Stratakis
e4c8578188 Update to 3.1.1 (#1783776) 2020-06-30 17:50:11 +02:00
Miro Hrončok
95033b7db0 Reenable latex tests 2020-05-28 20:46:34 +02:00
Miro Hrončok
1a1e29e5a8 Rebuilt for Python 3.9 2020-05-23 09:21:40 +02:00
Miro Hrončok
19463ebbdd Bootstrap for Python 3.9 2020-05-22 19:20:34 +02:00
Miro Hrončok
23b5cdf21e Backport another patch from upstream for Python 3.9 support 2020-05-20 09:58:45 +02:00
Miro Hrončok
7afb2d61aa Skip latex tests
See https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/message/ILL6SD5U74RTVPDEK4WU743USLSQCIA3/
2020-05-20 09:58:38 +02:00
Miro Hrončok
d237e99bb9 Fix tests for Python3.9.0a5+
Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1829705
2020-05-11 13:19:44 +02:00
Fedora Release Engineering
bf5a2d48d8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-30 15:25:27 +00:00
Miro Hrončok
63a8f7aefb Stop skipping some tests that used to fail 2019-12-10 18:15:58 +01:00
Miro Hrončok
153c8a4054 Update to 2.2.2 (rhbz#1743018) 2019-12-10 18:00:39 +01:00
Charalampos Stratakis
3a5b12f688 Update to 2.2.0 (rhbz#1743018) 2019-12-10 17:49:04 +01:00
Miro Hrončok
fea4d52ef1 Rebuilt for Python 3.8.0rc1 (#1748018) 2019-10-03 14:31:05 +02:00
Miro Hrončok
a42c28ce7c Deselect test_gettext_definition_terms, test_text_definition_terms 2019-08-16 16:09:54 +02:00
Miro Hrončok
92839f3f56 Rebuilt for Python 3.8 2019-08-16 15:31:19 +02:00
Miro Hrončok
a06c535b39 Bootstrap for Python 3.8 2019-08-15 17:31:12 +02:00
Richard Shaw
8c43a53ed7 Rebuild for Python 3.8. 2019-08-15 01:28:28 -05:00
Fedora Release Engineering
e85e617e78 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-26 16:23:39 +00:00
Miro Hrončok
90754897ab Update to 2.1.2 (#1716158) 2019-06-23 12:29:55 +02:00
Miro Hrončok
dbb50a5e0f Own the sphinxcontrib directory (#1669790) 2019-04-10 17:29:29 +02:00
Miro Hrončok
833015ffe7 Update to 2.0.1 (#1697544) 2019-04-10 17:25:24 +02:00
Charalampos Stratakis
7cdc32e4ae Update to version 2.0.0b2 2019-03-27 21:40:25 +01:00
Miro Hrončok
d1c43fc658 Update to 2.0.0b1 and remove pyton2-sphinx
https://fedoraproject.org/wiki/Changes/Sphinx2
2019-03-11 14:06:48 +01:00
Alfredo Moralejo
016c639951 Update to 1.8.4 2019-02-13 10:37:15 +01:00
Fedora Release Engineering
bd7e5f534f - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-02 09:25:25 +00:00
Igor Gnatenko
d38712d2c8 Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:42 +01:00
Zbigniew Jędrzejewski-Szmek
de4211c65d Drop explicit locale setting
Python3 now sets unicode locale automatically, this workaround
should not be necessary anymore. For python2, let's use the lighter locale.
2018-11-18 22:08:30 +01:00
Marcel Plch
26b3d1a440 Remove unused patch 2018-07-31 16:56:09 +02:00
Marcel Plch
644e00c17b Update to 1.7.6 2018-07-23 18:00:01 +02:00
Miro Hrončok
9622ed923e Remove unused dependencies on xapian and simplejson 2018-07-13 17:17:13 +02:00
Zbigniew Jędrzejewski-Szmek
10b412f00c Add patch to fix build and another for #1589868 2018-07-05 18:51:53 +02:00
Miro Hrončok
88b03eafc5 Enable tests 2018-07-02 19:46:48 +02:00
Miro Hrončok
334b5cd671 Enable websupport 2018-07-02 19:18:45 +02:00
Miro Hrončok
6a162ce61a Bootstrap for 3.7 once more 2018-07-02 19:04:20 +02:00
Miro Hrončok
80327ebb05 Rebuilt for Python 3.7 2018-07-02 18:23:56 +02:00
Charalampos Stratakis
b037848b60 Update to 1.7.5 (bz#1570451) 2018-06-19 17:50:51 +02:00
Miro Hrončok
46248b49f8 Rebuilt for Python 3.7 2018-06-18 11:14:15 +02:00
Miro Hrončok
6947effe2b Bootstrap for Python 3.7 2018-06-15 11:49:53 +02:00
Miro Hrončok
74c8514689 Bootstrap for Python 3.7 2018-06-14 15:12:54 +02:00
Miro Hrončok
da1eff5e26 Allow bootstrapping sphinx
1. Introduce --without websupport

 Sphinx (build)requires sphinxcontrib-websupport but that
 (build)requires sphinx. This bcond can be used to bootstrap this.

2. Introduce --without tests

 The tests bring a lot of additional dependencies that make
 bootstrapping harder. This allows to build without tests.

3. Build the docs with self

 The documentation was built with 'python', thus importing sphinx
 from python2's sitelib. Sphinx was installed because of the above
 mentioned buildrequirement of sphinxcontrib-websupport.
 Now current sphinx from PWD is used, also python3 is used when
 available, otherwise python2. Never just python.
2018-05-14 21:10:43 +02:00
Petr Viktorin
baac7bad24 Conditionalize the ImageMagick build dependency & tests 2018-04-12 11:04:57 +02:00
Charalampos Stratakis
9e75ecd41f fix test_autodoc with Python 3.6.5 2018-04-11 19:05:47 +02:00
Petr Viktorin
61f25030e6 Update to 1.7.2 2018-04-11 16:00:06 +02:00
Charalampos Stratakis
3d9a6101c9 Update to 1.7.1 (bz#1534802) 2018-03-13 15:15:28 +01:00
Fedora Release Engineering
8e40c34f4a - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 10:57:14 +00:00
Charalampos Stratakis
ad1161d6bc Update to 1.6.6 (bz#1532435) 2018-01-09 11:46:54 +01:00
Iryna Shcherbina
e5eb957b03 Fix ambiguous Python 2 dependency declarations 2017-12-11 14:09:56 +01:00
Charalampos Stratakis
fa7fa5e015 Update to 1.6.5 (bz#1508237) 2017-11-06 13:40:45 +01:00
Troy Dawson
e75c1dcce9 Cleanup spec file conditionals 2017-10-09 12:20:27 -07:00
Charalampos Stratakis
bf86b0e51b Update to 1.6.4 (rhbz#1426928) 2017-09-26 15:29:32 +02:00
Charalampos Stratakis
3a77d8ce47 Provide the epoch tag in order to keep the upgrade path clean
after the downgrade of sphinx at F26.
2017-09-21 11:05:50 +02:00
Fedora Release Engineering
ce8ab307f4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 11:53:11 +00:00
Charalampos Stratakis
6fe65c3b4d Update to 1.6.3 (rhbz#1426928)
Mark the test_latex_remote_images as expected failure
since it tries to fetch images from the web which is not possible
in koji or mock.

Added dependencies on python-typing,
python-sphinxcontrib-websupport, tex(ctablestack.sty)
and ImageMagick.
2017-07-20 19:58:34 +02:00
Toshio Kuratomi
43596e5731 builddir => buildroot 2017-02-18 10:10:48 -08:00
Toshio Kuratomi
ffb77c7ed3 Cleanup source files that should not be installed
Fix the __init__.pyc that was byte compiled for the wrong python
2017-02-18 10:02:44 -08:00
Toshio Kuratomi
f73229b3b1 Add more buildrequires for tests 2017-02-17 09:33:29 -08:00
Toshio Kuratomi
b5d98f0f4d Xapian patch no longer needed 2017-02-17 08:52:07 -08:00
Toshio Kuratomi
145cab2c32 Remember to update the source tarball as well 2017-02-17 08:28:24 -08:00
Toshio Kuratomi
5bf198167c Update to 1.5.2
Remove a few latex dependencies that are no longer needed
2017-02-17 07:59:44 -08:00
Fedora Release Engineering
9ea173bb1e - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 10:32:17 +00:00
Toshio Kuratomi
ea98c3de4b environment-modules is less featureful than Lmod.
Select the default version in a different way since environment-modules
    didn't understand the symlink
  Ignore error messsages in the shell startup script as environment-modules
    prints an error message if a module has already been loaded.  The command
    is doing the right thing for this case except that it's also printing an
    error message.
2017-01-31 11:52:19 -08:00
Toshio Kuratomi
74b3a560b8 Add recipe for setting the system default to the README.fedora 2017-01-26 18:13:59 -08:00
Toshio Kuratomi
baaecbbb4a Move the unversioned executables into the python2 package as they are now
using python2 to run
2017-01-18 22:39:26 -08:00
Toshio Kuratomi
fa7e4f510b Add README.fedora so people know how to use environment-modules to switch.
Change the default to be the python2 version to match with the guidelines
Switch to generic environment(modules) instead of Lmod specifically.
2017-01-18 22:12:32 -08:00
Toshio Kuratomi
4944f766cd One more texlive dep 2016-12-30 23:57:27 -08:00
Toshio Kuratomi
1a1466a96e Fix typo in one texlive dep 2016-12-30 22:58:18 -08:00
Toshio Kuratomi
2f352b47f7 Disable linkcheck tests as they hit the network 2016-12-30 22:35:04 -08:00
Toshio Kuratomi
93a4ba510a Fix test_build_latex tests by adding more texlive packages as Requires/BuildRequires 2016-12-30 22:22:40 -08:00
Toshio Kuratomi
79d38f37ff rpmlint fixes to python-sphinx spec file 2016-12-30 22:12:24 -08:00
Orion Poplawski
b6f4a595f7 Add needed BRs for testing 2016-12-30 16:28:03 -07:00
Orion Poplawski
cc11c8ff89 Add BR/R on python-requests 2016-12-30 16:10:25 -07:00
Orion Poplawski
c729227123 Update to 1.5.1 2016-12-30 15:10:00 -07:00
11 changed files with 544 additions and 402 deletions

38
.gitignore vendored
View File

@@ -5,3 +5,41 @@
/Sphinx-1.4.6.tar.gz
/Sphinx-1.4.8.tar.gz
/Sphinx-1.4.9.tar.gz
/Sphinx-1.5.1.tar.gz
/Sphinx-1.5.2.tar.gz
/Sphinx-1.6.3.tar.gz
/Sphinx-1.6.4.tar.gz
/Sphinx-1.6.5.tar.gz
/Sphinx-1.6.6.tar.gz
/Sphinx-1.7.1.tar.gz
/Sphinx-1.7.2.tar.gz
/Sphinx-1.7.5.tar.gz
/Sphinx-1.7.6.tar.gz
/Sphinx-1.8.4.tar.gz
/Sphinx-2.0.0b1.tar.gz
/Sphinx-2.0.0b2.tar.gz
/Sphinx-2.0.1.tar.gz
/Sphinx-2.1.2.tar.gz
/Sphinx-2.2.0.tar.gz
/Sphinx-2.2.2.tar.gz
/Sphinx-3.1.1.tar.gz
/Sphinx-3.1.2.tar.gz
/Sphinx-3.2.1.tar.gz
/Sphinx-3.3.1.tar.gz
/Sphinx-3.4.3.tar.gz
/Sphinx-3.5.2.tar.gz
/Sphinx-3.5.3.tar.gz
/Sphinx-3.5.4.tar.gz
/Sphinx-4.0.2.tar.gz
/Sphinx-4.1.2.tar.gz
/Sphinx-4.2.0.tar.gz
/Sphinx-4.3.0.tar.gz
/Sphinx-4.3.1.tar.gz
/Sphinx-4.4.0.tar.gz
/Sphinx-4.5.0.tar.gz
/Sphinx-5.0.2.tar.gz
/Sphinx-5.1.1.tar.gz
/Sphinx-5.2.3.tar.gz
/Sphinx-5.3.0.tar.gz
/Sphinx-6.1.3.tar.gz
/Sphinx-6.2.1.tar.gz

View File

@@ -1,15 +0,0 @@
--- sphinx/doc/Makefile.mantarget 2014-02-13 23:28:58.604797750 +0700
+++ sphinx/doc/Makefile 2014-02-14 00:00:45.794658764 +0700
@@ -12,6 +12,12 @@
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+# Likewise for man, since a man directory exist and make will assume
+# the target is up to date
+.PHONY: man
+man:
+ @$(SPHINXBUILD) -M man "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%:

View File

@@ -1,21 +0,0 @@
diff --git Sphinx-1.3.1/sphinx/builders/linkcheck.py~ Sphinx-1.3.1/sphinx/builders/linkcheck.py
index 9f5c2131c2..71bec0262d 100644
--- Sphinx-1.3.1/sphinx/builders/linkcheck.py~
+++ Sphinx-1.3.1/sphinx/builders/linkcheck.py
@@ -19,9 +19,15 @@ from six.moves import queue
from six.moves.urllib.request import build_opener, Request, HTTPRedirectHandler
from six.moves.urllib.parse import unquote, urlsplit, quote
from six.moves.urllib.error import HTTPError
-from six.moves.html_parser import HTMLParser, HTMLParseError
+from six.moves.html_parser import HTMLParser
from docutils import nodes
+try:
+ from HTMLParser import HTMLParseError
+except ImportError:
+ class HTMLParseError(Exception):
+ pass
+
from sphinx.builders import Builder
from sphinx.util.console import purple, red, darkgreen, darkgray, \
darkred, turquoise

View File

@@ -1,113 +1,103 @@
%if 0%{?fedora}
%global with_python3 1
%else
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
%endif
# When bootstrapping sphinx in Fedora, we don't yet have sphinxcontrib-websupport
# Without it we have warnings in docs, but it's not a hard dependency
# We don't want to support sphinxcontrib-websupport in RHEL, hence disabling the dependency
%bcond websupport %{undefined rhel}
# Also, we don't have all the tests requirements
%bcond tests 1
# At some point, RHEL will need to be in here too
%if 0%{?fedora} && 0%{?fedora} > 24
%global py3_default 1
%else
%global py3_default 0
%endif
# Unset -s on python shebang to allow RPM-installed sphinx to be used
# with user-installed modules (#1903763)
%undefine _py3_shebang_s
# No internet in Koji
%bcond internet 0
# Build without BuildRequires ImageMagick, to skip imgconverter tests
%bcond imagemagick_tests %{undefined rhel}
# Same for filelock -- we don't want it in RHEL just to run a handful of tests here
%bcond filelock_tests %{undefined rhel}
# During texlive updates, sometimes the latex environment is unstable
%bcond latex_tests 1
%global upstream_name Sphinx
Name: python-sphinx
Version: 1.4.9
Release: 2%{?dist}
%global general_version 6.2.1
#global prerel ...
%global upstream_version %{general_version}%{?prerel}
Version: %{general_version}%{?prerel:~%{prerel}}
Release: 4%{?dist}
Epoch: 1
Summary: Python documentation generator
Group: Development/Tools
# Unless otherwise noted, the license for code is BSD-2-Clause
# sphinx/themes/haiku/static/haiku.css_t has bits licensed with MIT
License: BSD-2-Clause AND MIT
URL: https://www.sphinx-doc.org/
Source: %{pypi_source %{upstream_name} %{upstream_version}}
# Allow extra themes to exist. We pull in python3-sphinx-theme-alabaster
# which causes that test to fail.
Patch: sphinx-test_theming.diff
# Unless otherwise noted, the license for code is BSD
# sphinx/util/stemmer.py Public Domain
# sphinx/pycode/pgen2 Python
# jquery (MIT or GPLv2)
License: BSD and Public Domain and Python and (MIT or GPLv2)
URL: http://sphinx-doc.org/
Source0: https://files.pythonhosted.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
Source1: python2-sphinx
Source2: python3-sphinx
Source3: zz-modules-python-sphinx.sh
Source4: zz-modules-python-sphinx.csh
#Patch0: Sphinx-1.2.1-mantarget.patch
BuildArch: noarch
BuildRequires: python2-devel >= 2.4
BuildRequires: python2-babel
BuildRequires: python2-setuptools
BuildRequires: python-docutils
BuildRequires: python-jinja2
BuildRequires: python-pygments >= 2.0
BuildRequires: python-six
BuildRequires: python2-sphinx_rtd_theme
BuildRequires: python2-sphinx-theme-alabaster
BuildRequires: python2-imagesize
BuildRequires: environment(modules)
# for fixes
BuildRequires: dos2unix
BuildRequires: make
BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: pyproject-rpm-macros
# for testing
BuildRequires: python-nose
%if %{with websupport}
BuildRequires: python%{python3_pkgversion}-sphinxcontrib-websupport
%endif
%if %{with tests}
# tests import _testcapi
BuildRequires: python%{python3_pkgversion}-test
BuildRequires: gcc
BuildRequires: gettext
BuildRequires: texinfo
BuildRequires: graphviz
BuildRequires: python-sqlalchemy
BuildRequires: python2-mock
BuildRequires: python-whoosh
BuildRequires: python2-snowballstemmer
# note: no Python3 xapian binding yet
BuildRequires: xapian-bindings-python
BuildRequires: texinfo
%if %{with imagemagick_tests}
BuildRequires: ImageMagick
%endif
%if %{with latex_tests}
BuildRequires: texlive-collection-fontsrecommended
BuildRequires: texlive-collection-latex
BuildRequires: texlive-dvipng
BuildRequires: texlive-dvisvgm
BuildRequires: texlive-ucs
BuildRequires: tex(cmap.sty)
BuildRequires: tex(ecrm1000.tfm)
BuildRequires: tex(fancybox.sty)
BuildRequires: tex(footnote.sty)
BuildRequires: tex(framed.sty)
BuildRequires: tex(multirow.sty)
BuildRequires: tex(parskip.sty)
BuildRequires: tex(titlesec.sty)
BuildRequires: tex(threeparttable.sty)
BuildRequires: tex(upquote.sty)
BuildRequires: tex(wrapfig.sty)
BuildRequires: tex(capt-of.sty)
BuildRequires: tex(needspace.sty)
BuildRequires: tex(eqparbox.sty)
BuildRequires: tex(amsmath.sty)
BuildRequires: tex(amsthm.sty)
BuildRequires: tex(amssymb.sty)
BuildRequires: tex(amsfonts.sty)
BuildRequires: tex(bm.sty)
BuildRequires: tex(palatino.sty)
BuildRequires: tex(multirow.sty)
BuildRequires: tex(eqparbox.sty)
BuildRequires: tex(atbegshi.sty)
BuildRequires: tex(anyfontsize.sty)
BuildRequires: tex(article.cls)
BuildRequires: tex(capt-of.sty)
BuildRequires: tex(cmap.sty)
BuildRequires: tex(color.sty)
BuildRequires: tex(ctablestack.sty)
BuildRequires: tex(fancyhdr.sty)
BuildRequires: tex(fancyvrb.sty)
BuildRequires: tex(fncychap.sty)
BuildRequires: tex(framed.sty)
BuildRequires: tex(FreeSerif.otf)
BuildRequires: tex(geometry.sty)
BuildRequires: tex(hyperref.sty)
BuildRequires: tex(kvoptions.sty)
BuildRequires: tex(luatex85.sty)
%if 0%{?with_python3}
BuildRequires: python3-devel
BuildRequires: python3-babel
BuildRequires: python3-setuptools
BuildRequires: python3-docutils
BuildRequires: python3-jinja2
BuildRequires: python3-pygments
BuildRequires: python3-nose
BuildRequires: python3-sqlalchemy
BuildRequires: python3-mock
BuildRequires: python3-whoosh
BuildRequires: python3-snowballstemmer
BuildRequires: python3-six
BuildRequires: python3-sphinx_rtd_theme
BuildRequires: python3-sphinx-theme-alabaster
BuildRequires: python3-imagesize
%endif # with_python3
BuildRequires: tex(needspace.sty)
BuildRequires: tex(parskip.sty)
BuildRequires: tex(polyglossia.sty)
BuildRequires: tex(tabulary.sty)
BuildRequires: tex(titlesec.sty)
BuildRequires: tex(upquote.sty)
BuildRequires: tex(utf8x.def)
BuildRequires: tex(wrapfig.sty)
%endif
%endif
%description
@@ -139,34 +129,14 @@ the Python docs:
snippets and inclusion of appropriately formatted docstrings.
%package -n python2-sphinx
%package -n python%{python3_pkgversion}-sphinx
Summary: Python documentation generator
Requires: python-sphinx-locale = %{version}-%{release}
Requires: python2-babel
Requires: python-docutils
Requires: python-jinja2
Requires: python-pygments
Requires: python2-mock
Requires: python2-snowballstemmer
Requires: python2-sphinx_rtd_theme
Requires: python2-six
Requires: python2-sphinx-theme-alabaster
Requires: python2-imagesize
Requires(posttrans): Lmod
# Needed to get rid of the alternatives config installed in f24 and f25
# versions of the package
Requires(posttrans): /usr/sbin/alternatives
Recommends: graphviz
Obsoletes: python-sphinx <= 1.2.3
Obsoletes: python-sphinxcontrib-napoleon < 0.5
Provides: python-sphinxcontrib-napoleon = %{version}-%{release}
Obsoletes: python2-Sphinx <= 1.3.1-4
Provides: python2-Sphinx = %{version}-%{release}
Provides: python(Sphinx) = %{version}-%{release}
%{?python_provide:%python_provide python2-sphinx}
Conflicts: python3-sphinx < %{version}-%{release}
%description -n python2-sphinx
Recommends: graphviz
Recommends: ImageMagick
%description -n python%{python3_pkgversion}-sphinx
Sphinx is a tool that makes it easy to create intelligent and
beautiful documentation for Python projects (or other documents
consisting of multiple reStructuredText sources), written by Georg
@@ -195,42 +165,44 @@ the Python docs:
snippets and inclusion of appropriately formatted docstrings.
%package latex
Summary: LaTeX builder dependencies for %{name}
Requires: python(Sphinx) = %{version}-%{release}
%package -n python%{python3_pkgversion}-sphinx-latex
Summary: LaTeX builder dependencies for python%{python3_pkgversion}-sphinx
Requires: python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
Requires: texlive-collection-fontsrecommended
Requires: texlive-collection-latex
Requires: texlive-dvipng
Requires: texlive-dvisvgm
Requires: texlive-ucs
Requires: tex(cmap.sty)
Requires: tex(ecrm1000.tfm)
Requires: tex(fancybox.sty)
Requires: tex(footnote.sty)
Requires: tex(framed.sty)
Requires: tex(multirow.sty)
Requires: tex(parskip.sty)
Requires: tex(titlesec.sty)
Requires: tex(threeparttable.sty)
Requires: tex(upquote.sty)
Requires: tex(wrapfig.sty)
Requires: tex(capt-of.sty)
Requires: tex(needspace.sty)
Requires: tex(eqparbox.sty)
Requires: tex(amsmath.sty)
Requires: tex(amsthm.sty)
Requires: tex(amssymb.sty)
Requires: tex(amsfonts.sty)
Requires: tex(bm.sty)
Requires: tex(palatino.sty)
Requires: tex(multirow.sty)
Requires: tex(eqparbox.sty)
Requires: tex(atbegshi.sty)
Requires: tex(anyfontsize.sty)
Requires: tex(article.cls)
Requires: tex(capt-of.sty)
Requires: tex(cmap.sty)
Requires: tex(color.sty)
Requires: tex(ctablestack.sty)
Requires: tex(fancyhdr.sty)
Requires: tex(fancyvrb.sty)
Requires: tex(fncychap.sty)
Requires: tex(framed.sty)
Requires: tex(FreeSerif.otf)
Requires: tex(geometry.sty)
Requires: tex(hyperref.sty)
Requires: tex(kvoptions.sty)
Requires: tex(luatex85.sty)
Obsoletes: python3-sphinx-latex < 1.4.4-2
Requires: tex(needspace.sty)
Requires: tex(parskip.sty)
Requires: tex(polyglossia.sty)
Requires: tex(tabulary.sty)
Requires: tex(titlesec.sty)
Requires: tex(upquote.sty)
Requires: tex(utf8x.def)
Requires: tex(wrapfig.sty)
%description latex
# No files in this package, automatic provides don't work:
%py_provides python%{python3_pkgversion}-sphinx-latex
%description -n python%{python3_pkgversion}-sphinx-latex
Sphinx is a tool that makes it easy to create intelligent and
beautiful documentation for Python projects (or other documents
consisting of multiple reStructuredText sources), written by Georg
@@ -242,68 +214,10 @@ This package pulls in the TeX dependencies needed by Sphinx's LaTeX
builder.
%if 0%{?with_python3}
%package -n python3-sphinx
Summary: Python documentation generator
Group: Development/Tools
Requires: python-sphinx-locale = %{version}-%{release}
Requires: python3-babel
Requires: python3-docutils
Requires: python3-jinja2
Requires: python3-pygments
Requires: python3-mock
Requires: python3-snowballstemmer
Requires: python3-sphinx_rtd_theme
Requires: python3-sphinx-theme-alabaster
Requires: python3-imagesize
Requires: python3-six
Recommends: graphviz
Requires(posttrans): Lmod
# Needed to get rid of the alternatives config installed in f24 and f25
# versions of the package
Requires(posttrans): /usr/sbin/alternatives
Obsoletes: python3-sphinxcontrib-napoleon < 0.3.0
Provides: python3-sphinxcontrib-napoleon = %{version}-%{release}
Provides: python(Sphinx) = %{version}-%{release}
%{?python_provide:%python_provide python3-sphinx}
Conflicts: python2-Sphinx < %{version}-%{release}
Conflicts: python2-sphinx < %{version}-%{release}
%description -n python3-sphinx
Sphinx is a tool that makes it easy to create intelligent and
beautiful documentation for Python projects (or other documents
consisting of multiple reStructuredText sources), written by Georg
Brandl. It was originally created to translate the new Python
documentation, but has now been cleaned up in the hope that it will be
useful to many other projects.
Sphinx uses reStructuredText as its markup language, and many of its
strengths come from the power and straightforwardness of
reStructuredText and its parsing and translating suite, the Docutils.
Although it is still under constant development, the following
features are already present, work fine and can be seen "in action" in
the Python docs:
* Output formats: HTML (including Windows HTML Help) and LaTeX,
for printable PDF versions
* Extensive cross-references: semantic markup and automatic links
for functions, classes, glossary terms and similar pieces of
information
* Hierarchical structure: easy definition of a document tree, with
automatic links to siblings, parents and children
* Automatic indices: general index as well as a module index
* Code handling: automatic highlighting using the Pygments highlighter
* Various extensions are available, e.g. for automatic testing of
snippets and inclusion of appropriately formatted docstrings.
%endif # with_python3
%package doc
Summary: Documentation for %{name}
Group: Documentation
License: BSD
Requires: python(Sphinx) = %{version}-%{release}
License: BSD-2-Clause
Recommends: python%{python3_pkgversion}-sphinx = %{epoch}:%{version}-%{release}
%description doc
Sphinx is a tool that makes it easy to create intelligent and
@@ -313,99 +227,76 @@ Brandl. It was originally created to translate the new Python
documentation, but has now been cleaned up in the hope that it will be
useful to many other projects.
This package contains documentation in reST and HTML formats.
This package contains documentation in the HTML format.
%package locale
Summary: Locale files for %{name}
Group: Development/Tools
License: BSD
%description locale
Sphinx is a tool that makes it easy to create intelligent and
beautiful documentation for Python projects (or other documents
consisting of multiple reStructuredText sources), written by Georg
Brandl. It was originally created to translate the new Python
documentation, but has now been cleaned up in the hope that it will be
useful to many other projects.
This package contains locale files for Sphinx
%prep
%autosetup -n %{upstream_name}-%{version}%{?prerel} -p1
%autosetup -n %{upstream_name}-%{upstream_version} -p1
sed '1d' -i sphinx/pycode/pgen2/token.py
%if %{without imagemagick_tests}
rm tests/test_ext_imgconverter.py
%endif
# fix line encoding of bundled jquery.js
dos2unix -k ./sphinx/themes/basic/static/jquery.js
%if %{without filelock_tests}
sed -i '/filelock/d' pyproject.toml
rm tests/test_build_linkcheck.py tests/test_ext_intersphinx.py
%endif
%if 0%{?with_python3}
rm -rf %{py3dir}
cp -a . %{py3dir}
%endif # with_python3
%if %{defined rhel}
# unwanted dependency in RHEL, https://bugzilla.redhat.com/show_bug.cgi?id=1945182
sed -i '/html5lib/d' pyproject.toml
%endif
%generate_buildrequires
%pyproject_buildrequires -r %{?with_tests:-x test}
%build
%py2_build
%if 0%{?with_python3}
%py3_build
%endif # with_python3
%pyproject_wheel
export PYTHONPATH=$PWD
pushd doc
make html
make man
export SPHINXBUILD="%{python3} ../sphinx/cmd/build.py"
make html SPHINXBUILD="$SPHINXBUILD"
make man SPHINXBUILD="$SPHINXBUILD"
rm -rf _build/html/.buildinfo
# Those files are copied to _build/html/_images and loaded to the
# html pages from there - we can safely remove the duplicated and unused files
rm -rf _build/html/_static/themes _build/html/_static/tutorial
rm -f _build/html/_static/more.png _build/html/_static/translation.svg
mv _build/html ..
popd
%install
%if 0%{?with_python3}
%py3_install
install -d %{buildroot}%{_libexecdir}/python3-sphinx
for i in sphinx-{apidoc,autogen,build,quickstart}; do
mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version}
ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3
ln -s %{_bindir}/$i-3 %{buildroot}%{_libexecdir}/python3-sphinx/$i
done
%endif # with_python3
%pyproject_install
%py2_install
install -d %{buildroot}%{_libexecdir}/python2-sphinx
# For backwards compatibility. Remove with care, if at all
for i in sphinx-{apidoc,autogen,build,quickstart}; do
mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python2_version}
ln -s $i-%{python2_version} %{buildroot}%{_bindir}/$i-2
ln -s %{_bindir}/$i-2 %{buildroot}%{_libexecdir}/python2-sphinx/$i
ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version}
ln -s %{_bindir}/$i %{buildroot}%{_bindir}/$i-3
done
# Clean up non-python files
rm -f %{buildroot}%{python3_sitelib}/sphinx/locale/.DS_Store
rm -rf %{buildroot}%{python3_sitelib}/sphinx/locale/.tx
pushd doc
# Deliver man pages
install -d %{buildroot}%{_mandir}/man1
for f in _build/man/sphinx-*.1;
do
### TODO: these are all the same. Do we really need to ship them three
### times or is it fine to just ship them as e.g. sphinx-build.1
cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f)
cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python2_version}.1|")
cp -p $f %{buildroot}%{_mandir}/man1/$(basename $f | sed -e "s|.1$|-%{python3_version}.1|")
done
# Remove language files, they're identical to the ones from the
# Python 2 build that will be moved to /usr/share below
find %{buildroot}%{python3_sitelib}/sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -exec rm -rf '{}' \;
popd
# Deliver rst files
rm -rf doc/_build
sed -i 's|python ../sphinx-build.py|/usr/bin/sphinx-build|' doc/Makefile
mv doc reST
# Move language files to /usr/share;
# patch to support this incorporated in 0.6.6
pushd %{buildroot}%{python_sitelib}
pushd %{buildroot}%{python3_sitelib}
for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
do
test $lang == __pycache__ && continue
install -d %{buildroot}%{_datadir}/sphinx/locale/$lang
install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
mv sphinx/locale/$lang/LC_MESSAGES/sphinx.js \
@@ -416,36 +307,9 @@ do
done
popd
install -d %{buildroot}%{_modulesdir}/python-sphinx
install -m 0644 %{SOURCE1} %{buildroot}%{_modulesdir}/python-sphinx/
sed -i 's|@python2_sphinx_dir@|%{_libexecdir}/python2-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python2-sphinx
install -m 0644 %{SOURCE2} %{buildroot}%{_modulesdir}/python-sphinx/
sed -i 's|@python3_sphinx_dir@|%{_libexecdir}/python3-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python3-sphinx
install -d %{buildroot}%{_sysconfdir}/profile.d
install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
%if %{py3_default}
ln -s python3-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default
# These symlinks establish a default for when a package is first installed (and
# therefore, environment modules is not loaded). The user can immediately
# switch them by using module swap python-sphinx/python2-sphinx
for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
ln -s %{_libexecdir}/python3-sphinx/$filename %{buildroot}%{_bindir}/$filename
done
%else
ln -s python2-sphinx %{buildroot}%{_modulesdir}/python-sphinx/default
# These symlinks establish a default for when a package is first installed (and
# therefore, environment modules is not loaded). The user can immediately
# switch them by using module swap python-sphinx/python3-sphinx
for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
ln -s %{_libexecdir}/python2-sphinx/$filename %{buildroot}%{_bindir}/$filename
done
%endif
# Create the sphinxcontrib directory, so we can own it
# See https://bugzilla.redhat.com/show_bug.cgi?id=1669790 for rationale
mkdir %{buildroot}%{python3_sitelib}/sphinxcontrib
%find_lang sphinx
@@ -456,81 +320,357 @@ done
>> sphinx.lang
%if %{with tests}
%check
LANG=en_US.UTF-8 make test
%if 0%{?with_python3}
pushd %{py3dir}
LANG=en_US.UTF-8 PYTHON=python3 make test
popd
%endif # with_python3
# Currently, all linkcheck tests and test_latex_images need internet
# test_build_latex_doc needs internet to download pictures,
# but fails also with it enabled, we decided to skip it entirely
# In RHEL builds, skip tests which use html5lib (excluded above)
%pytest \
%if %{defined rhel}
--ignore tests/test_build_html.py \
--ignore tests/test_build_latex.py \
--ignore tests/test_build_texinfo.py \
--ignore tests/test_domain_std.py \
--ignore tests/test_smartquotes.py \
%endif
%if %{without internet}
-k "not linkcheck and not test_latex_images and not test_build_latex_doc" \
%endif
;
%endif
%pre -n python2-sphinx
# python-sphinx as shipped in an update to f24 and f25 used alternatives. So
# we need to clean up the alternatives configuration until at least f27
%{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python2_version} || :
%if 0%{?with_python3}
%pre -n python3-sphinx
# python-sphinx as shipped in an update to f24 and f25 used alternatives. So
# we need to clean up the alternatives configuration until at least f27
%{_sbindir}/update-alternatives --remove sphinx-build %{_bindir}/sphinx-build-%{python3_version} || :
%endif # with_python3
%files latex
%license LICENSE
%files locale -f sphinx.lang
%files -n python%{python3_pkgversion}-sphinx -f sphinx.lang
%license LICENSE
%doc AUTHORS CHANGES EXAMPLES README.rst
%{_bindir}/sphinx-*
%{python3_sitelib}/sphinx/
%dir %{python3_sitelib}/sphinxcontrib/
%{python3_sitelib}/sphinx-%{upstream_version}.dist-info/
%dir %{_datadir}/sphinx/
%dir %{_datadir}/sphinx/locale
%dir %{_datadir}/sphinx/locale/*
%{_mandir}/man1/sphinx-*
%files -n python2-sphinx
%license LICENSE
%doc AUTHORS CHANGES EXAMPLES README.rst
%{_bindir}/sphinx-*-2*
%{python2_sitelib}/sphinx/
%{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/
%exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1*
%{_mandir}/man1/*
%{_libexecdir}/python2-sphinx/
%{_modulesdir}/python-sphinx/python2-sphinx
%if !%{py3_default}
%{_modulesdir}/python-sphinx/default
%endif
%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
%if 0%{?with_python3}
%files -n python%{python3_pkgversion}-sphinx-latex
# empty, this is a metapackage
%files -n python3-sphinx
%license LICENSE
%doc AUTHORS CHANGES EXAMPLES README.rst
%{_bindir}/sphinx-*-3*
%{_bindir}/sphinx-build
%{_bindir}/sphinx-apidoc
%{_bindir}/sphinx-autogen
%{_bindir}/sphinx-quickstart
%{python3_sitelib}/sphinx/
%{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/
%{_mandir}/man1/sphinx-*-%{python3_version}.1*
%{_libexecdir}/python3-sphinx/
%{_modulesdir}/python-sphinx/python3-sphinx
%if %{py3_default}
%{_modulesdir}/python-sphinx/default
%endif
%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
%endif # with_python3
%files doc
%doc html reST
%license LICENSE
%doc html
%changelog
* Thu Jul 27 2023 Miro Hrončok <mhroncok@redhat.com> - 1:6.2.1-4
- Don't use filelock to test this package on RHEL
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:6.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jul 13 2023 Karolina Surma <ksurma@redhat.com> - 1:6.2.1-2
- Don't use websupport to build documentation on RHEL
* Mon Jun 26 2023 Karolina Surma <ksurma@redhat.com> - 1:6.2.1-1
- Update to 6.2.1
- Fixes rhbz#2188968
* Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 1:6.1.3-4
- Rebuilt for Python 3.12
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 1:6.1.3-3
- Bootstrap for Python 3.12
* Wed May 31 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1:6.1.3-2
- Avoid html5lib test dependency in RHEL builds
* Fri Mar 10 2023 Karolina Surma <ksurma@redhat.com> - 1:6.1.3-1
- Update to 6.1.3
- Fixes rhbz#2135122
* Thu Mar 09 2023 Karolina Surma <ksurma@redhat.com> - 1:5.3.0-4
- Fix tests related to missing setuptools and Babel 2.12
- Fixes rhbz#2176685
* Tue Jan 31 2023 Karolina Surma <ksurma@redhat.com> - 1:5.3.0-3
- Fix tests with python-pygments 2.14+
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Nov 08 2022 Karolina Surma <ksurma@redhat.com> - 1:5.3.0-1
- Update to 5.3.0
- Fixes rhbz#2129546
* Mon Aug 15 2022 Karolina Surma <ksurma@redhat.com> - 1:5.1.1-1
- Update to 5.1.1
- Fixes rhbz#2110473
- Remove reST documentation from the -doc package, ship only HTML
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Jun 21 2022 Karolina Surma <ksurma@redhat.com> - 1:5.0.2-1
- Update to 5.0.2
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1:4.5.0-3
- Rebuilt for Python 3.11
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1:4.5.0-2
- Bootstrap for Python 3.11
* Fri Apr 01 2022 Karolina Surma <ksurma@redhat.com> - 1:4.5.0-1
- Update to 4.5.0
- Fixes rhbz#2068924
* Tue Feb 01 2022 Karolina Surma <ksurma@redhat.com> - 1:4.4.0-1
- Update to 4.4.0
- Fixes rhbz#2033955
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Nov 29 2021 Karolina Surma <ksurma@redhat.com> - 1:4.3.1-1
- Update to 4.3.1
- Fixes rhbz#2027059
* Fri Nov 19 2021 Karolina Surma <ksurma@redhat.com> - 1:4.3.0-1
- Update to 4.3.0
- Fixes rhbz#2022111
* Fri Sep 17 2021 Karolina Surma <ksurma@redhat.com> - 1:4.2.0-1
- Update to 4.2.0
- Fixes rhbz#2003427
* Thu Sep 16 2021 Karolina Surma <ksurma@redhat.com> - 1:4.1.2-3
- Display typing objects correctly with Python 3.10 (fix FTBFS)
- Generate correct reference to parent class if class has `_name` attribute
- Enable previously deselected test
* Wed Aug 18 2021 Karolina Surma <ksurma@redhat.com> - 1:4.1.2-2
- Patch python-sphinx to work with python-pygments >=2.10
* Mon Aug 02 2021 Karolina Surma <ksurma@redhat.com> - 1:4.1.2-1
- Update to 4.1.2
- Fixes rhbz#1979326
- Backport commit to fix python-sphinx with Python 3.10-rc1
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.0.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 11 2021 Karolina Surma <ksurma@redhat.com> - 1:4.0.2-1
- Update to 4.0.2
- Fixes rhbz#1948279
* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 1:3.5.4-3
- Rebuilt for Python 3.10
* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 1:3.5.4-2
- Bootstrap for Python 3.10
* Mon May 10 2021 Karolina Surma <ksurma@redhat.com> - 1:3.5.4-1
- Update to 3.5.4
- Fixes rhbz#1949477
* Thu Apr 01 2021 Karolina Surma <ksurma@redhat.com> - 1:3.5.3-1
- Update to 3.5.3
- Fixes rhbz#1941161
* Wed Mar 10 2021 Charalampos Stratakis <cstratak@redhat.com> - 1:3.5.2-1
- Update 3.5.2
- Fixes rhbz#1928459
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jan 19 2021 Charalampos Stratakis <cstratak@redhat.com> - 1:3.4.3-1
- Update to 3.4.3
- Fixes rhbz#1909494
* Sat Dec 05 2020 Mattia Verga <mattia.verga@protonmail.com> - 1:3.3.1-2
- Unset -s from python shebang
- Fixes: rhbz#1903763
* Mon Nov 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.3.1-1
- Update to 3.3.1
- Fixes: rhbz#1893752
* Wed Oct 14 2020 Tomas Hrnciar <thrnciar@redhat.com> - 1:3.2.1-2
- Backport commit to fix python-sphinx with python-pygments v2.7.1
* Tue Aug 18 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.2.1-1
- Update to 3.2.1
- Remove compatibility symbolic links from /usr/libexec/
- Fixes rhbz#1867294
* Fri Aug 07 2020 Miro Hrončok <mhroncok@redhat.com> - 1:3.1.2-1
- Update to 3.1.2
- Fixes rhbz#1853901
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jun 30 2020 Charalampos Stratakis <cstratak@redhat.com> - 1:3.1.1-1
- Update to 3.1.1 (#1783776)
* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-4
- Rebuilt for Python 3.9
* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-3
- Bootstrap for Python 3.9
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Dec 10 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.2.2-1
- Update to 2.2.2 (rhbz#1743018)
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-6
- Rebuilt for Python 3.8.0rc1 (#1748018)
* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-5
- Rebuilt for Python 3.8
* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-4
- Bootstrap for Python 3.8
* Thu Aug 15 2019 Richard Shaw <hobbes1069@gmail.com> - 1:2.1.2-3
- Rebuild for Python 3.8.
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Jun 23 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.1.2-1
- Update to 2.1.2 (#1716158)
* Wed Apr 10 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.0.1-1
- Update to 2.0.1 (#1697544)
- Own the sphinxcontrib directory (#1669790)
* Wed Mar 27 2019 Charalampos Stratakis <cstratak@redhat.com> - 1:2.0.0~b2-1
- Update to 2.0.0b2
* Wed Feb 27 2019 Miro Hrončok <mhroncok@redhat.com> - 1:2.0.0~b1-1
- Update to 2.0.0b1
- Drop Python 2 package
- https://fedoraproject.org/wiki/Changes/Sphinx2
* Thu Feb 07 2019 Alfredo Moralejo <amoralej@redhat.com> - 1:1.8.4-1
- Update to 1.8.4.
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.7.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:1.7.6-2
- Drop explicit locale setting for python3, use C.UTF-8 for python2
See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
* Mon Jul 23 2018 Marcel Plch <mplch@redhat.com> - 1:1.7.6-1
- Update to 1.7.6
* Fri Jul 13 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-6
- Remove unused dependencies on xapian and simplejson
* Thu Jul 5 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1:1.7.5-5
- Add patch to fix build if alabaster theme is installed
- Add patch for #1589868
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-4
- Enable tests
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-3
- Enable websupport
* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.5-2
- Rebuilt for Python 3.7
* Tue Jun 19 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.7.5-1
- Update to 1.7.5 (bz#1570451)
* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.2-5
- Rebuilt for Python 3.7
* Fri Jun 15 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.2-4
- Bootstrap for Python 3.7
* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 1:1.7.2-3
- Bootstrap for Python 3.7
* Wed Apr 11 2018 Petr Viktorin <pviktori@redhat.com> - 1:1.7.2-2
- Conditionalize the ImageMagick build dependency & tests
* Wed Apr 11 2018 Petr Viktorin <pviktori@redhat.com> - 1:1.7.2-1
- Update to 1.7.2 (bz#1558968)
* Tue Mar 13 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.7.1-1
- Update to 1.7.1 (bz#1534802)
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.6.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Tue Jan 09 2018 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.6-1
- Update to 1.6.6 (bz#1532435)
* Mon Dec 11 2017 Iryna Shcherbina <ishcherb@redhat.com> - 1:1.6.5-2
- Fix ambiguous Python 2 dependency declarations
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Mon Nov 06 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.5-1
- Update to 1.6.5 (bz#1508237)
* Mon Oct 09 2017 Troy Dawson <tdawson@redhat.com> - 1:1.6.4-2
- Cleanup spec file conditionals
* Tue Sep 26 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.4-1
- Update to 1.6.4 (bz#1426928)
* Wed Sep 20 2017 Charalampos Stratakis <cstratak@redhat.com> - 1:1.6.3-3
- Provide the epoch tag in order to keep the upgrade path clean.
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu Jul 20 2017 Charalampos Stratakis <cstratak@redhat.com> - - 1.6.3-1
- Update to 1.6.3 (bz#1426928)
* Sat Feb 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.2-2
- Cleanup source files that should not be installed
- Fix the __init__.pyc that was byte compiled for the wrong python
* Fri Feb 17 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.2-1
- Update to 1.5.2
- Remove a few latex dependencies that are no longer needed
- Remove xapian patch; now in upstream tarball
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Tue Jan 31 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-5
- environment-modules is less featureful than Lmod.
- Select the default version in a different way since environment-modules
didn't understand the symlink
- Ignore error messsages in the shell startup script as environment-modules
prints an error message if a module has already been loaded. The command
is doing the right thing for this case except that it's also printing an
error message.
* Thu Jan 26 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-4
- Add recipe for setting the system default to the README.fedora
* Wed Jan 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-3
- Move the unversioned executables into the python2 package as they are now
using python2 to run
* Wed Jan 18 2017 Toshio Kuratomi <toshio@fedoraproject.org> - - 1.5.1-2
- Add README.fedora so people know how to use environment-modules to switch.
- Change the default to be the python2 version to match with the guidelines
- Switch to generic environment(modules) instead of Lmod specifically.
* Fri Dec 30 2016 Orion Poplawski <orion@cora.nwra.com> - 1.5.1-1
- Update to 1.5.1
* Fri Dec 30 2016 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4.9-2
- Remove alternatives. Alternatives should only be used for a very small
number of packages (system daemons which also have a compatible command line

View File

@@ -1,6 +0,0 @@
#%Module 1.0
#
# python2-sphinx module for use with 'environment modules' package
#
conflict python-sphinx
prepend-path PATH @python2_sphinx_dir@

View File

@@ -1,6 +0,0 @@
#%Module 1.0
#
# python2-sphinx module for use with 'environment modules' package
#
conflict python-sphinx
prepend-path PATH @python3_sphinx_dir@

4
rpminspect.yaml Normal file
View File

@@ -0,0 +1,4 @@
# exclude XML template (not always valid) from XML validity check:
xml:
ignore:
- /usr/lib/python*/site-packages/sphinx/themes/basic/opensearch.xml

View File

@@ -1 +1 @@
SHA512 (Sphinx-1.4.9.tar.gz) = 8dd16fc947a59a1fadb0b00f0f6a83a4dd1321569cdb86a96d68f6f9c9acb85d5fa234ffde1a986b95346569b166a90647cc5e9b64516bc184ebad932b1c0156
SHA512 (Sphinx-6.2.1.tar.gz) = 88daae1f9bacbf513c0db1e7d732104b00ac36803b82e253d14eda287b4d48cfa34d0ed90b13099748610f405dc8bdcc54c2d33002a27b970117baf93418a062

12
sphinx-test_theming.diff Normal file
View File

@@ -0,0 +1,12 @@
diff -ru Sphinx-1.7.6/tests/test_theming.py Sphinx-1.7.6_patched/tests/test_theming.py
--- Sphinx-1.7.6/tests/test_theming.py 2018-07-16 11:24:40.000000000 +0200
+++ Sphinx-1.7.6_patched/tests/test_theming.py 2018-07-20 15:17:35.049263077 +0200
@@ -25,7 +25,7 @@
themes.append('alabaster')
# test Theme class API
- assert set(app.registry.html_themes.keys()) == set(themes)
+ assert set(app.registry.html_themes.keys()) >= set(themes)
assert app.registry.html_themes['test-theme'] == app.srcdir / 'test_theme' / 'test-theme'
assert app.registry.html_themes['ziptheme'] == app.srcdir / 'ziptheme.zip'
assert app.registry.html_themes['staticfiles'] == app.srcdir / 'test_theme' / 'staticfiles'

View File

@@ -1,2 +0,0 @@
# Add path to the default python-sphinx scripts on this version of Fedora
module load python-sphinx

View File

@@ -1,2 +0,0 @@
# Add path to the default python-sphinx scripts on this version of Fedora
module load python-sphinx