diff --git a/.gitignore b/.gitignore index ba46069..c922267 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,3 @@ /xtl-0.7.3.tar.gz /xtl-0.7.4.tar.gz /xtl-0.7.5.tar.gz -/xtl-0.7.6.tar.gz -/xtl-0.7.7.tar.gz -/xtl-0.8.0.tar.gz -/xtl-0.8.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index d11d5ba..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# See the documentation for more information: -# https://packit.dev/docs/configuration/ ---- -jobs: - - job: pull_from_upstream - trigger: release - dist_git_branches: - rawhide: - fast_forward_merge_into: - - fedora-branched - - job: koji_build - trigger: commit - dist_git_branches: - - fedora-all - - job: bodhi_update - trigger: commit - dist_git_branches: - - fedora-all diff --git a/0001-Fix-build-with-sphinx-4.patch b/0001-Fix-build-with-sphinx-4.patch new file mode 100644 index 0000000..34697ca --- /dev/null +++ b/0001-Fix-build-with-sphinx-4.patch @@ -0,0 +1,35 @@ +From 1fd2aef4fcaabddcb533ffe2f999e55d1e3ce7fe Mon Sep 17 00:00:00 2001 +From: Elliott Sales de Andrade +Date: Sun, 11 Jul 2021 17:54:54 -0400 +Subject: [PATCH] Fix build with Sphinx 4. + +`add_stylesheet` was deprecated in 1.8 and removed in 4.0 [1]. The +replacement, `add_css_file` was added in 1.0, which is older than any +version required by `breathe`. + +[1] https://www.sphinx-doc.org/en/master/extdev/deprecated.html?highlight=add_stylesheet +--- + docs/source/conf.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/docs/source/conf.py b/docs/source/conf.py +index 333b75c..242e3fd 100644 +--- a/docs/source/conf.py ++++ b/docs/source/conf.py +@@ -15,8 +15,10 @@ + + html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] + ++ + def setup(app): +- app.add_stylesheet("main_stylesheet.css") ++ app.add_css_file("main_stylesheet.css") ++ + + extensions = ['breathe'] + breathe_projects = { 'xtl': '../xml' } +@@ -35,4 +37,3 @@ def setup(app): + pygments_style = 'sphinx' + todo_include_todos = False + htmlhelp_basename = 'xtldoc' +- diff --git a/README.packit b/README.packit deleted file mode 100644 index fb341a1..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. diff --git a/sources b/sources index 824c53c..ef690d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xtl-0.8.1.tar.gz) = cb032d27b2f7dff135c442fd92e3924eb108355769354c9eee9ec2d3ec7ebd867ee89ee2e10f41352447e08f185637f338fdc40e37d60d85cf2fffdcaac1ce6c +SHA512 (xtl-0.7.5.tar.gz) = fb447334f68f255d7d28c9202eee2cec70d007c1031f3756a6acd0cc019c0d95ed1d12ec63f2e9fb3df184f9ec305e6a3c808bb88c1e3eb922916ad059d2e856 diff --git a/xtl.spec b/xtl.spec index d7e9e37..c158daa 100644 --- a/xtl.spec +++ b/xtl.spec @@ -2,13 +2,15 @@ %global debug_package %{nil} Name: xtl -Version: 0.8.1 +Version: 0.7.5 Release: %autorelease License: BSD-3-Clause Summary: QuantStack tools library Url: https://github.com/QuantStack/xtl Source0: https://github.com/QuantStack/%{name}/archive/%{version}/%{name}-%{version}.tar.gz +Patch0: 0001-Fix-build-with-sphinx-4.patch + BuildRequires: binutils BuildRequires: cmake BuildRequires: doctest-devel @@ -41,7 +43,11 @@ Documentation files for %{name} library. %prep -%autosetup -p1 +%autosetup -p1 -N + +%if 0%{?rhel} && 0%{?rhel} < 9 +%patch -P0 -p1 -R +%endif %build @@ -53,11 +59,14 @@ make html SPHINXBUILD=sphinx-build-3 rm build/html/.buildinfo popd + %install %cmake_install + %check -%cmake_build --target xtest +make -C "%{__cmake_builddir}" xtest + %files devel %doc README.md @@ -69,5 +78,6 @@ popd %files doc %doc docs/build/html + %changelog %autochangelog