diff --git a/.gitattributes b/.gitattributes index 9b03811..e6096f7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,6 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text +## Specific LFS patterns +crypto.inv filter=lfs diff=lfs merge=lfs -text +python3.inv filter=lfs diff=lfs merge=lfs -text diff --git a/crypto.inv b/crypto.inv new file mode 100644 index 0000000..264442d --- /dev/null +++ b/crypto.inv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41ce8ae745441735db7d7745cc412146c483377c44cda20d7844e0e1141e19a2 +size 9076 diff --git a/fetch-intersphinx-inventories.sh b/fetch-intersphinx-inventories.sh new file mode 100644 index 0000000..6d9209a --- /dev/null +++ b/fetch-intersphinx-inventories.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +wget -O pyopenssl.inv https://pyopenssl.readthedocs.io/en/stable/objects.inv +wget -O python3.inv https://docs.python.org/3/objects.inv +wget -O crypto.inv https://cryptography.io/en/latest/objects.inv + diff --git a/local-intersphinx-inventories.patch b/local-intersphinx-inventories.patch new file mode 100644 index 0000000..73449b5 --- /dev/null +++ b/local-intersphinx-inventories.patch @@ -0,0 +1,15 @@ +Index: b/docs/conf.py +=================================================================== +--- a/docs/conf.py ++++ b/docs/conf.py +@@ -301,7 +301,7 @@ texinfo_documents = [ + + # Example configuration for intersphinx: refer to the Python standard library. + intersphinx_mapping = { +- "https://docs.python.org/3/": None, +- "https://pyopenssl.readthedocs.io/en/stable": None, +- "https://cryptography.io/en/stable/": None, ++ "https://docs.python.org/3/": "python3.inv", ++ "https://pyopenssl.readthedocs.io/en/stable": "pyopenssl.inv", ++ "https://cryptography.io/en/stable/": "crypto.inv", + } diff --git a/pyopenssl.inv b/pyopenssl.inv new file mode 100644 index 0000000..62c85df Binary files /dev/null and b/pyopenssl.inv differ diff --git a/python-service_identity.changes b/python-service_identity.changes index afe73c9..3a34caa 100644 --- a/python-service_identity.changes +++ b/python-service_identity.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 4 19:49:08 UTC 2019 - Hans-Peter Jansen + +- add local-intersphinx-inventories.patch for generating the docs + correctly +- add fetch-intersphinx-inventories.sh to fetch the inventories + ------------------------------------------------------------------- Tue Dec 4 12:54:12 UTC 2018 - Matej Cepl diff --git a/python-service_identity.spec b/python-service_identity.spec index 646495b..9e643ab 100644 --- a/python-service_identity.spec +++ b/python-service_identity.spec @@ -1,8 +1,8 @@ # # spec file for package python-service_identity # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# Copyright (c) 2014 LISA GmbH, Bingen, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2014-2019 LISA GmbH, Bingen, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,10 @@ License: MIT Group: Development/Languages/Python URL: https://github.com/pyca/service_identity Source0: https://pypi.io/packages/source/s/%{oname}/%{oname}-%{version}.tar.gz +Source1: python3.inv +Source2: pyopenssl.inv +Source3: crypto.inv +Patch1: local-intersphinx-inventories.patch # Documentation BuildRequires: %{python_module Sphinx} BuildRequires: %{python_module attrs} @@ -54,11 +58,18 @@ relevant RFCs too. %prep %setup -q -n %{oname}-%{version} +%autopatch -p1 + +# prepare local intersphinx inventories, fetch with fetch-intersphinx-inventories.sh +cp -v %{S:1} docs/ +cp -v %{S:2} docs/ +cp -v %{S:3} docs/ %build %python_build # make man and documentation +export PYTHONPATH=$(pwd)/build/lib cd docs # do not run these in parallel to ensure reproducible builds (boo#1102408) make %{?_smp_mflags} man diff --git a/python3.inv b/python3.inv new file mode 100644 index 0000000..99ffcde --- /dev/null +++ b/python3.inv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c8b6fe404be5534e725ad69abf2a0f7deb6a2972b6500584df61102ce20d7fd +size 102981