From ad836dd0e52f31a9dfdd43151725ac0821d24f4144322538f2958429b1f02eb8 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 26 Apr 2023 21:03:02 +0000 Subject: [PATCH 1/2] - Move documentation into main package for SLE15 - add sle15_python_module_pythons (jsc#PED-68) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-paramiko?expand=0&rev=109 --- python-paramiko.changes | 10 ++++++++++ python-paramiko.spec | 12 +++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/python-paramiko.changes b/python-paramiko.changes index 500fd2b..c7d7cee 100644 --- a/python-paramiko.changes +++ b/python-paramiko.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Apr 23 23:16:46 UTC 2023 - Matej Cepl + +- Move documentation into main package for SLE15 + +------------------------------------------------------------------- +Fri Apr 21 12:28:59 UTC 2023 - Dirk Müller + +- add sle15_python_module_pythons (jsc#PED-68) + ------------------------------------------------------------------- Sun Nov 20 18:38:07 UTC 2022 - Ben Greiner diff --git a/python-paramiko.spec b/python-paramiko.spec index 180ec1c..4a087de 100644 --- a/python-paramiko.spec +++ b/python-paramiko.spec @@ -1,7 +1,7 @@ # # spec file for package python-paramiko # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,6 +17,7 @@ %define skip_python2 1 +%{?sle15_python_module_pythons} Name: python-paramiko Version: 2.12.0 Release: 0 @@ -29,6 +30,11 @@ Patch0: paramiko-test_extend_timeout.patch # PATCH-FIX-UPSTREAM paramiko-pr1665-remove-pytest-relaxed.patch gh#paramiko/paramiko#1665 -- pytest-relaxed is broken Patch1: paramiko-pr1665-remove-pytest-relaxed.patch BuildRequires: %{python_module PyNaCl >= 1.0.1} +%if 0%{?suse_version} > 1550 +BuildRequires: python3-Sphinx +%else +BuildRequires: %{python_module Sphinx} +%endif BuildRequires: %{python_module bcrypt >= 3.1.3} BuildRequires: %{python_module cryptography >= 2.5} BuildRequires: %{python_module gssapi} @@ -57,6 +63,7 @@ Emphasis is on using SSH2 as an alternative to SSL for making secure connections between python scripts. All major ciphers and hash methods are supported. SFTP client and server mode are both supported too. +%if 0%{?suse_version} > 1500 %package -n python-paramiko-doc Summary: Documentation for %{name} Group: Documentation/Other @@ -69,6 +76,7 @@ connections between python scripts. All major ciphers and hash methods are supported. SFTP client and server mode are both supported too. This package contains the documentation. +%endif %prep %autosetup -p1 -n paramiko-%{version} @@ -94,8 +102,10 @@ export LANG=en_US.UTF-8 %{python_sitelib}/paramiko %{python_sitelib}/paramiko-%{version}*-info +%if 0%{?suse_version} > 1500 %files -n python-paramiko-doc %license LICENSE +%endif %doc demos/ %changelog From d189e738cbd7be57e85cf3a76e1a0c17ad8a9e805e4667a3ad44373bc012b8b1 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 26 Apr 2023 21:03:22 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-paramiko?expand=0&rev=110 --- python-paramiko.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-paramiko.spec b/python-paramiko.spec index 4a087de..6725b05 100644 --- a/python-paramiko.spec +++ b/python-paramiko.spec @@ -30,7 +30,7 @@ Patch0: paramiko-test_extend_timeout.patch # PATCH-FIX-UPSTREAM paramiko-pr1665-remove-pytest-relaxed.patch gh#paramiko/paramiko#1665 -- pytest-relaxed is broken Patch1: paramiko-pr1665-remove-pytest-relaxed.patch BuildRequires: %{python_module PyNaCl >= 1.0.1} -%if 0%{?suse_version} > 1550 +%if 0%{?suse_version} > 1500 BuildRequires: python3-Sphinx %else BuildRequires: %{python_module Sphinx}