From 7222fe2030e257cd8d015cd50c9469003471ec5e041d9f0a729ae31e845f6c38 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 6 Feb 2019 08:55:31 +0000 Subject: [PATCH 1/2] Accepting request 671988 from home:frispete:python By now, the cffi dependency is fullfilled by chance, but back than, I managed a situation, where pyOpenSSL was installed, but dysfunctional, because cffi was missing... - add local-intersphinx-inventories.patch for generating the docs correctly - add fetch-intersphinx-inventories.sh to fetch the inventories - add missing python-cffi dependency OBS-URL: https://build.opensuse.org/request/show/671988 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyOpenSSL?expand=0&rev=54 --- .gitattributes | 3 +++ crypto.inv | 3 +++ fetch-intersphinx-inventories.sh | 5 +++++ local-intersphinx-inventories.patch | 13 +++++++++++++ python-pyOpenSSL.changes | 12 ++++++++++++ python-pyOpenSSL.spec | 11 ++++++++++- python3.inv | 3 +++ 7 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 crypto.inv create mode 100644 fetch-intersphinx-inventories.sh create mode 100644 local-intersphinx-inventories.patch create mode 100644 python3.inv 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 From ef709a81f0a42274c29b7cf4a8501124f18f562e55ee4b6f631b4ad56a7b141f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 26 Feb 2019 08:50:40 +0000 Subject: [PATCH 2/2] Accepting request 679046 from home:TheBlackCat:branches:devel:languages:python - Add fetch-intersphinx-inventories.sh to sources OBS-URL: https://build.opensuse.org/request/show/679046 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyOpenSSL?expand=0&rev=55 --- python-pyOpenSSL.changes | 5 +++++ python-pyOpenSSL.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/python-pyOpenSSL.changes b/python-pyOpenSSL.changes index 2dc3303..72836db 100644 --- a/python-pyOpenSSL.changes +++ b/python-pyOpenSSL.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 25 19:56:35 UTC 2019 - Todd R + +- Add fetch-intersphinx-inventories.sh to sources + ------------------------------------------------------------------- Sat Feb 2 18:56:14 UTC 2019 - Hans-Peter Jansen diff --git a/python-pyOpenSSL.spec b/python-pyOpenSSL.spec index 5ca843d..0fcc20a 100644 --- a/python-pyOpenSSL.spec +++ b/python-pyOpenSSL.spec @@ -28,6 +28,7 @@ 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 +Source3: fetch-intersphinx-inventories.sh Patch1: skip-networked-test.patch Patch2: openssl-1.1.0i.patch Patch3: openssl-1.1.1.patch