Compare commits

..

No commits in common. 'i10cs' and 'c9' have entirely different histories.
i10cs ... c9

2
.gitignore vendored

@ -1,2 +1,2 @@
SOURCES/objects.inv SOURCES/objects.inv
SOURCES/sphinx_rtd_theme-2.0.0.tar.gz SOURCES/sphinx_rtd_theme-0.5.1.tar.gz

@ -1,2 +1,2 @@
ce1f4100c06c7cecc70dea1c806aa74518d27039 SOURCES/objects.inv 8572b8e45ad362a9dac225c7512e960d634f186d SOURCES/objects.inv
ba22772b6b624001c8af0f7ba9493b3e74fe94f2 SOURCES/sphinx_rtd_theme-2.0.0.tar.gz 0a7a5203dc9e888d22fd1bb44e59e0f8f5ffad71 SOURCES/sphinx_rtd_theme-0.5.1.tar.gz

@ -1,42 +1,42 @@
--- a/package.json --- package.json.orig 2020-06-17 09:58:25.000000000 -0600
+++ b/package.json +++ package.json 2020-12-10 08:27:04.247691945 -0700
@@ -25,7 +25,6 @@ @@ -16,7 +16,6 @@
"css-loader": "^3.6.0", "css-loader": "^3.1.0",
"file-loader": "^3.0.1", "file-loader": "^3.0.1",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
- "html5shiv": "^3.7.3", - "html5shiv": "^3.7.3",
"imports-loader": "^0.8.0", "imports-loader": "^0.8.0",
"jquery": "^3.6.0", "jquery": "^3.4.1",
"lato-font": "^3.0.0", "lato-font": "^3.0.0",
--- a/package-lock.json --- package-lock.json.orig 2020-06-17 09:58:25.000000000 -0600
+++ b/package-lock.json +++ package-lock.json 2020-12-10 08:27:28.658644927 -0700
@@ -3314,12 +3314,6 @@ @@ -3614,12 +3614,6 @@
"integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==", "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
"dev": true "dev": true
}, },
- "html5shiv": { - "html5shiv": {
- "version": "3.7.3", - "version": "3.7.3",
- "resolved": "https://registry.npmjs.org/html5shiv/-/html5shiv-3.7.3.tgz", - "resolved": "https://registry.npmjs.org/html5shiv/-/html5shiv-3.7.3.tgz",
- "integrity": "sha512-SZwGvLGNtgp8GbgFX7oXEp8OR1aBt5LliX6dG0kdD1kl3KhMonN0QcSa/A3TsTgFewaGCbIryQunjayWDXzxmw==", - "integrity": "sha1-14qEo2e8uacQEA1XgCw4ewhGMdI=",
- "dev": true - "dev": true
- }, - },
"http-deceiver": { "http-deceiver": {
"version": "1.2.7", "version": "1.2.7",
"resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
--- a/sphinx_rtd_theme/layout.html --- sphinx_rtd_theme/layout.html.orig 2020-06-17 09:58:25.000000000 -0600
+++ b/sphinx_rtd_theme/layout.html +++ sphinx_rtd_theme/layout.html 2020-12-10 08:28:12.607551700 -0700
@@ -61,9 +61,6 @@ @@ -45,9 +45,6 @@
{#- JAVASCRIPTS #} {# JAVASCRIPTS #}
{%- block scripts %} {%- block scripts %}
- <!--[if lt IE 9]> - <!--[if lt IE 9]>
- <script src="{{ pathto('_static/js/html5shiv.min.js', 1) }}"></script> - <script src="{{ pathto('_static/js/html5shiv.min.js', 1) }}"></script>
- <![endif]--> - <![endif]-->
{%- if not embedded %} {%- if not embedded %}
{# XXX Sphinx 1.8.0 made this an external js-file, quick fix until we refactor the template to inherert more blocks directly from sphinx #} {# XXX Sphinx 1.8.0 made this an external js-file, quick fix until we refactor the template to inherert more blocks directly from sphinx #}
{%- if sphinx_version_info >= (1, 8) -%} {% if sphinx_version >= "1.8.0" %}
--- a/webpack.common.js --- webpack.common.js.orig 2020-06-17 09:58:25.000000000 -0600
+++ b/webpack.common.js +++ webpack.common.js 2020-12-10 08:26:44.191730575 -0700
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
const path = require("path"); const path = require("path");
const MiniCssExtractPlugin = require("mini-css-extract-plugin"); const MiniCssExtractPlugin = require("mini-css-extract-plugin");

File diff suppressed because one or more lines are too long

@ -4,20 +4,21 @@
%bcond_with bootstrap %bcond_with bootstrap
Name: python-%{srcname} Name: python-%{srcname}
Version: 2.0.0 Version: 0.5.1
Release: 5%{?dist} Release: 4%{?dist}
Summary: Sphinx theme for readthedocs.org Summary: Sphinx theme for readthedocs.org
# SPDX
License: MIT License: MIT
URL: https://github.com/readthedocs/%{srcname}/ URL: https://github.com/rtfd/%{srcname}
Source: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz Source0: https://github.com/rtfd/%{srcname}/archive/%{version}/%{srcname}-%{version}.tar.gz
# The koji builders do not have network access, and this file is not included # The koji builders do not have network access, and this file is not included
# in any Fedora package, so we retrieve it for offline use. # in any Fedora package, so we retrieve it for offline use.
Source: https://docs.readthedocs.io/en/latest/objects.inv Source1: https://docs.readthedocs.io/en/latest/objects.inv
# Remove all traces of html5shiv. We have no interest in supporting ancient # Remove all traces of html5shiv. We have no interest in supporting ancient
# versions of Internet Explorer. # versions of Internet Explorer.
Patch: %{name}-html5shiv.patch Patch0: %{name}-html5shiv.patch
# Unbundle fonts. Refer to local fonts instead.
Patch1: %{name}-unbundle-fonts.patch
BuildArch: noarch BuildArch: noarch
@ -26,9 +27,13 @@ BuildRequires: font(lato)
BuildRequires: font(robotoslab) BuildRequires: font(robotoslab)
BuildRequires: make BuildRequires: make
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: %{py3_dist docutils}
BuildRequires: %{py3_dist readthedocs-sphinx-ext}
BuildRequires: %{py3_dist setuptools}
%if %{without bootstrap} %if %{without bootstrap}
BuildRequires: %{py3_dist pytest} BuildRequires: %{py3_dist pytest}
BuildRequires: %{py3_dist sphinx} BuildRequires: %{py3_dist sphinx}
BuildRequires: %{py3_dist sphinxcontrib-httpdomain}
BuildRequires: python-sphinx-doc BuildRequires: python-sphinx-doc
%endif %endif
@ -63,64 +68,23 @@ readthedocs.org.
%endif %endif
%prep %prep
%autosetup -p1 -n %{srcname}-%{version} %autosetup -p0 -n %{srcname}-%{version}
# Use local objects.inv for intersphinx # Use local objects.inv for intersphinx
sed -e "s|\('https://docs\.readthedocs\.io/en/stable/', \)None|\1'%{SOURCE1}'|" \ sed -e "s|\('https://docs\.readthedocs\.io/en/latest/', \)None|\1'%{SOURCE1}'|" \
-e "s|\('https://www\.sphinx-doc\.org/en/master/', \)None|\1'%{_docdir}/python-sphinx-doc/html/objects.inv'|" \ -e "s|\('http://www\.sphinx-doc\.org/en/stable/', \)None|\1'%{_docdir}/python-sphinx-doc/html/objects.inv'|" \
-i docs/conf.py -i docs/conf.py
# We modify the tests to avoid dependency on readthedocs-sphinx-ext.
# According to upstream, the test dependency is only used to test integration with that dependency.
# See https://github.com/readthedocs/readthedocs-sphinx-ext/pull/105#pullrequestreview-928253285
sed -Ei -e "/extensions\.append\('readthedocs_ext\.readthedocs'\)/d" \
-e "s/'readthedocs[^']*'(, ?)?//g" \
tests/util.py
# We patch the theme css files to unbundle fonts (they are required from Fedora)
# Using Web Assets shall support the use case when documentation is
# exported via web server
# See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Web_Assets/
pushd sphinx_rtd_theme/static/css
rm -r fonts
# Edit the fonts references in theme.css and badge.css
for FONT in lato-normal=lato/Lato-Regular.ttf \
lato-bold=lato/Lato-Bold.ttf \
lato-normal-italic=lato/Lato-Italic.ttf \
lato-bold-italic=lato/Lato-BoldItalic.ttf \
Roboto-Slab-Regular=google-roboto-slab-fonts/RobotoSlab-Regular.ttf \
Roboto-Slab-Bold=google-roboto-slab-fonts/RobotoSlab-Bold.ttf;
do
L="${FONT%=*}"
R="${FONT#*=}"
# Get the font basename from the path
F="${R#*/}"
F_BASENAME="${F/.ttf}"
sed \
-e "s|src:\(url(fonts/$L\.[^)]*) format([^)]*),\?\)\+|src:local('$F_BASENAME'),url('/.sysassets/fonts/$R') format(\"truetype\")|g" \
-i theme.css
done
sed -e "s|src:url(fonts/fontawesome-webfont\.[^)]*);||" \
-e "s|src:\(url(fonts/fontawesome-webfont\.[^)]*) format([^)]*),\?\)\+|src:local(\"FontAwesome\"),url('/.sysassets/fonts/fontawesome/fontawesome-webfont.ttf') format(\"truetype\")|" \
-i badge_only.css theme.css
popd
# We cannot build the Javascript from source at this time, due to many missing # We cannot build the Javascript from source at this time, due to many missing
# dependencies. Convince the build script to skip building the Javascript and # dependencies. Convince the build script to skip building the Javascript and
# go on to the python. # go on to the python.
mkdir -p build/lib/%{srcname}/static/js mkdir -p build/lib/%{srcname}/static/js
cp -p sphinx_rtd_theme/static/js/badge_only.js build/lib/%{srcname}/static/js cp -p sphinx_rtd_theme/static/js/badge_only.js build/lib/%{srcname}/static/js
cp -p sphinx_rtd_theme/static/js/theme.js build/lib/%{srcname}/static/js cp -p sphinx_rtd_theme/static/js/theme.js build/lib/%{srcname}/static/js
sed -i "/'build_py'/d" setup.py
%generate_buildrequires
%pyproject_buildrequires
%build %build
%pyproject_wheel %py3_build
%if %{without bootstrap} %if %{without bootstrap}
# Build the documentation # Build the documentation
@ -130,27 +94,24 @@ make -C docs html
rst2html --no-datestamp README.rst README.html rst2html --no-datestamp README.rst README.html
%install %install
%pyproject_install %py3_install
%if %{without bootstrap} %if %{without bootstrap}
rm docs/build/html/.buildinfo rm docs/build/html/.buildinfo
%endif %endif
%check # Unbundle fonts
rm -fr %{buildroot}%{python3_sitelib}/%{srcname}/static/css/fonts
%if %{without bootstrap} %if %{without bootstrap}
%pytest %check
pytest
%endif %endif
# Test that the forbidden fonts were successfully removed from the css files
grep 'format("woff2\?")' \
%{buildroot}%{python3_sitelib}/%{srcname}/static/css/badge_only.css \
%{buildroot}%{python3_sitelib}/%{srcname}/static/css/theme.css \
&& exit 1 || true
%files -n python%{python3_pkgversion}-%{srcname} %files -n python%{python3_pkgversion}-%{srcname}
%doc README.html %doc README.html
%license LICENSE %license LICENSE
%{python3_sitelib}/%{srcname}-%{version}.dist-info/ %{python3_sitelib}/%{srcname}-*.egg-info/
%dir %{python3_sitelib}/%{srcname}/ %dir %{python3_sitelib}/%{srcname}/
%{python3_sitelib}/%{srcname}/__pycache__/ %{python3_sitelib}/%{srcname}/__pycache__/
%{python3_sitelib}/%{srcname}/static/ %{python3_sitelib}/%{srcname}/static/
@ -159,26 +120,17 @@ grep 'format("woff2\?")' \
%{python3_sitelib}/%{srcname}/theme.conf %{python3_sitelib}/%{srcname}/theme.conf
%dir %{python3_sitelib}/%{srcname}/locale/ %dir %{python3_sitelib}/%{srcname}/locale/
%{python3_sitelib}/%{srcname}/locale/sphinx.pot %{python3_sitelib}/%{srcname}/locale/sphinx.pot
%lang(da) %{python3_sitelib}/%{srcname}/locale/da/
%lang(de) %{python3_sitelib}/%{srcname}/locale/de/ %lang(de) %{python3_sitelib}/%{srcname}/locale/de/
%lang(en) %{python3_sitelib}/%{srcname}/locale/en/ %lang(en) %{python3_sitelib}/%{srcname}/locale/en/
%lang(es) %{python3_sitelib}/%{srcname}/locale/es/ %lang(es) %{python3_sitelib}/%{srcname}/locale/es/
%lang(et) %{python3_sitelib}/%{srcname}/locale/et/ %lang(et) %{python3_sitelib}/%{srcname}/locale/et/
%lang(fa_IR) %{python3_sitelib}/%{srcname}/locale/fa_IR/
%lang(fr) %{python3_sitelib}/%{srcname}/locale/fr/ %lang(fr) %{python3_sitelib}/%{srcname}/locale/fr/
%lang(hr) %{python3_sitelib}/%{srcname}/locale/hr/
%lang(hu) %{python3_sitelib}/%{srcname}/locale/hu/
%lang(it) %{python3_sitelib}/%{srcname}/locale/it/
%lang(lt) %{python3_sitelib}/%{srcname}/locale/lt/
%lang(nl) %{python3_sitelib}/%{srcname}/locale/nl/ %lang(nl) %{python3_sitelib}/%{srcname}/locale/nl/
%lang(pl) %{python3_sitelib}/%{srcname}/locale/pl/ %lang(pt) %{python3_sitelib}/%{srcname}/locale/pt_BR/
%lang(pt) %{python3_sitelib}/%{srcname}/locale/pt/
%lang(pt_BR) %{python3_sitelib}/%{srcname}/locale/pt_BR/
%lang(ru) %{python3_sitelib}/%{srcname}/locale/ru/ %lang(ru) %{python3_sitelib}/%{srcname}/locale/ru/
%lang(sv) %{python3_sitelib}/%{srcname}/locale/sv/ %lang(sv) %{python3_sitelib}/%{srcname}/locale/sv/
%lang(tr) %{python3_sitelib}/%{srcname}/locale/tr/ %lang(tr) %{python3_sitelib}/%{srcname}/locale/tr/
%lang(zh_CN) %{python3_sitelib}/%{srcname}/locale/zh_CN/ %lang(zh) %{python3_sitelib}/%{srcname}/locale/zh_CN/
%lang(zh_TW) %{python3_sitelib}/%{srcname}/locale/zh_TW/
%if %{without bootstrap} %if %{without bootstrap}
%files doc %files doc
@ -187,96 +139,12 @@ grep 'format("woff2\?")' \
%endif %endif
%changelog %changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.0.0-5 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.5.1-4
- Bump release for October 2024 mass rebuild: - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Resolves: RHEL-64018 Related: rhbz#1991688
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.0.0-4
- Rebuilt for MSVSphere 10
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.0.0-4
- Bump release for June 2024 mass rebuild
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 04 2023 Karolina Surma <ksurma@redhat.com> - 2.0.0-1
- Update to 2.0.0
Fixes rhbz#2233302
* Mon Oct 16 2023 Miro Hrončok <mhroncok@redhat.com> - 1.2.2-2
- Do not BuildRequire python3-sphinxcontrib-httpdomain, it was not needed
* Mon Aug 07 2023 Karolina Surma <ksurma@redhat.com> - 1.2.2-1
- Update to 1.2.2
Fixes rhbz#2213220
- Make the package compatible with docutils 0.20+ and Sphinx 7
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 1.2.1-2
- Rebuilt for Python 3.12
* Wed May 24 2023 Karolina Surma <ksurma@redhat.com> - 1.2.1-1
- Update to 1.2.1
Fixes rhbz#2209270
* Tue Feb 21 2023 Karolina Surma <ksurma@redhat.com> - 1.2.0-1
- Update to 1.2.0
Fixes rhbz#2154374
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Nov 09 2022 Karolina Surma <ksurma@redhat.com> - 1.1.1-1
- Update to the new upstream version
- Relax the python-docutils version requirement to <0.20
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 01 2022 Karolina Surma <ksurma@redhat.com> - 1.0.0-7
- Relax the python-docutils version requirement to <0.19
- Improve references to system fonts (needed by Firefox)
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.0.0-6
- Rebuilt for Python 3.11
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 1.0.0-5
- Bootstrap for Python 3.11
* Wed Apr 13 2022 Miro Hrončok <mhroncok@redhat.com> - 1.0.0-4
- Avoid build dependency on readthedocs-sphinx-ext
* Fri Mar 25 2022 Karolina Surma <ksurma@redhat.com> - 1.0.0-3
- Unbundle fonts properly, improve referencing them in css files
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Sep 14 2021 Jerry James <loganjerry@gmail.com> - 1.0.0-1
- Version 1.0.0
- Drop upstreamed patch for Sphinx 4.1+
- Use the pyproject macros
* Wed Aug 04 2021 Miro Hrončok <mhroncok@redhat.com> - 0.5.2-5
- Fix for Sphinx 4.1+
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.5.2-3
- Rebuilt for Python 3.10
* Wed Jun 02 2021 Python Maint <python-maint@redhat.com> - 0.5.2-2
- Bootstrap for Python 3.10
* Tue Apr 6 2021 Jerry James <loganjerry@gmail.com> - 0.5.2-1 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.5.1-3
- Version 0.5.2 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-2 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save