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..8ccb9af --- /dev/null +++ b/fetch-intersphinx-inventories.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +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..8d4f5f1 --- /dev/null +++ b/local-intersphinx-inventories.patch @@ -0,0 +1,13 @@ +Index: b/doc/conf.py +=================================================================== +--- a/doc/conf.py ++++ b/doc/conf.py +@@ -254,6 +254,6 @@ man_pages = [ + ] + + intersphinx_mapping = { +- "https://docs.python.org/3": None, +- "https://cryptography.io/en/latest/": None, ++ "https://docs.python.org/3": "python3.inv", ++ "https://cryptography.io/en/latest/": "crypto.inv", + } diff --git a/python-pyOpenSSL.changes b/python-pyOpenSSL.changes index a8d2e20..2dc3303 100644 --- a/python-pyOpenSSL.changes +++ b/python-pyOpenSSL.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Feb 2 18:56:14 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 Oct 30 13:41:43 UTC 2018 - Vítězslav Čížek @@ -32,6 +39,11 @@ Thu Aug 16 15:48:21 UTC 2018 - tchvatal@suse.com * bug-lp-1265482.diff * rsa128-i586.patch +------------------------------------------------------------------- +Thu Jun 14 14:41:50 UTC 2018 - hpj@urpla.net + +- add missing python-cffi dependency + ------------------------------------------------------------------- Tue Feb 27 19:20:19 UTC 2018 - aplanas@suse.com diff --git a/python-pyOpenSSL.spec b/python-pyOpenSSL.spec index b198f14..5ca843d 100644 --- a/python-pyOpenSSL.spec +++ b/python-pyOpenSSL.spec @@ -1,7 +1,7 @@ # # spec file for package python-pyOpenSSL # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,10 +26,14 @@ License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/pyca/pyopenssl Source: https://files.pythonhosted.org/packages/source/p/pyOpenSSL/pyOpenSSL-%{version}.tar.gz +Source1: python3.inv +Source2: crypto.inv Patch1: skip-networked-test.patch Patch2: openssl-1.1.0i.patch Patch3: openssl-1.1.1.patch Patch4: tls13-renegotiation.patch +Patch5: local-intersphinx-inventories.patch +BuildRequires: %{python_module cffi} BuildRequires: %{python_module cryptography >= 2.3.0} BuildRequires: %{python_module flaky} BuildRequires: %{python_module pretend} @@ -38,6 +42,7 @@ BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-Sphinx +Requires: python-cffi Requires: python-cryptography >= 2.3.0 Requires: python-six >= 1.5.2 Provides: pyOpenSSL = %{version} @@ -68,6 +73,10 @@ Provides documentation for %{name}. %setup -q -n pyOpenSSL-%{version} %autopatch -p1 +# prepare local intersphinx inventories, fetch with fetch-intersphinx-inventories.sh +cp -v %{S:1} doc/ +cp -v %{S:2} doc/ + %build %python_build 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