Sync changes to SLFO-1.2 branch

2025-08-20 12:01:23 +02:00
4 changed files with 16 additions and 100 deletions
--- a/python-scp.changes
+++ b/python-scp.changes
@@ -1,83 +1,7 @@
 -------------------------------------------------------------------
-Thu Jun 12 09:24:05 UTC 2025 - Markéta Machová <mmachova@suse.com>
+Mon Dec 14 17:47:26 UTC 2020 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>

- Convert to pip-based build
- Update to 0.15.0
-  * Add bandwidth control (limit_bw)
-
-------------------------------------------------------------------
-Tue Jul 18 18:53:34 UTC 2023 - Antonio Teixeira <antonio.teixeira@suse.com>
-
- Update to 0.14.5:
-  * Update docstrings to clarify sanitation and use of wildcards
-  * Make sure to close the local file on errors
-
-------------------------------------------------------------------
-Thu Jul  6 12:09:19 UTC 2023 - ecsos <ecsos@opensuse.org>
-
- Add %{?sle15_python_module_pythons}
-
-------------------------------------------------------------------
-Tue Jul 19 11:58:04 UTC 2022 - Dirk Müller <dmueller@suse.com>
-
- update to 0.14.4:
-  * Update type hints for pyright
-
-------------------------------------------------------------------
-Tue Feb 22 09:22:56 UTC 2022 - Dirk Müller <dmueller@suse.com>
-
- update to 0.14.3:
-  * Add type hints
-
-------------------------------------------------------------------
-Mon Jan  3 12:34:19 UTC 2022 - Dirk Müller <dmueller@suse.com>
-
- update to 0.14.2:
-  * Don't fail if the remote path is a PurePath not a Path
-
-------------------------------------------------------------------
-Sun Oct 31 23:50:57 UTC 2021 - Matej Cepl <mcepl@suse.com>
-
- Switch off the test suite (gh#jbardin/scp.py#167).
-
-------------------------------------------------------------------
-Sat Sep 11 22:23:23 UTC 2021 - Martin Hauke <mardnh@gmx.de>
-
- Run unittests
- Get tarball from github.com instead pythonhosted.org
-
-------------------------------------------------------------------
-Sat Sep 11 12:35:33 UTC 2021 - Martin Hauke <mardnh@gmx.de>
-
- Update to 0.14.1
-  * Don't fail if 'pathlib' doesn't import (Python 2)
-  * Accept 'unicode' objects as paths (Python 2)
- Update to 0.14.0
-  * Accept iterables other than list and tuple in get() and put()
-  * Accept pathlib.Path objects
-
-------------------------------------------------------------------
-Sat Jul 17 13:37:23 UTC 2021 - Dirk Müller <dmueller@suse.com>
-
- update to 0.13.6:
-  * Fix put when the source directory has a trailing slash. It will now work
-    similarly to rsync, copying the contents of the directory.
-
-------------------------------------------------------------------
-Tue Jun 29 20:06:41 UTC 2021 - Martin Hauke <mardnh@gmx.de>
-
- Update to version 0.13.5
-  * Fix extra space sent in SSH command-line for get(), causing
-    issues on some servers.
- Update to version 0.13.4
-  * Add scp_command attribute, allowing changing the command run
-    on the server (for example to sudo scp)
-
-------------------------------------------------------------------
-Thu Nov 26 08:46:13 UTC 2020 - Dirk Mueller <dmueller@suse.com>
-
- update to 0.13.3:
-  - Fix hanging when underlying paramiko channel is closed
+- Update in SLE-15 (bsc#1176785, jsc#ECO-3105, jsc#PM-2352)

 -------------------------------------------------------------------
 Mon Mar 25 13:59:28 UTC 2019 - pgajdos@suse.com
--- a/python-scp.spec
+++ b/python-scp.spec
@@ -1,8 +1,8 @@
 #
 # spec file for package python-scp
 #
-# Copyright (c) 2025 SUSE LLC
-# Copyright (c) 2017-2021, Martin Hauke <mardnh@gmx.de>
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,18 @@
 #


-%{?sle15_python_module_pythons}
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-scp
-Version:        0.15.0
+Version:        0.13.2
 Release:        0
 Summary:        SSH scp module for paramiko
 License:        LGPL-2.1-or-later
 Group:          Development/Languages/Python
 URL:            https://github.com/jbardin/scp.py
-Source:         https://github.com/jbardin/scp.py/archive/refs/tags/v%{version}.tar.gz#/scp-%{version}.tar.gz
+Source:         https://files.pythonhosted.org/packages/source/s/scp/scp-%{version}.tar.gz
 BuildRequires:  %{python_module paramiko}
-BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
-BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
-BuildRequires:  openssh-clients
-BuildRequires:  openssh-server
 BuildRequires:  python-rpm-macros
 Requires:       python-paramiko
 BuildArch:      noarch
@@ -44,26 +40,22 @@ scp protocol. This is the protocol as referenced from the openssh scp program,
 and has only been tested with this implementation.

 %prep
-%setup -q -n scp.py-%{version}
+%setup -q -n scp-%{version}

 %build
-%pyproject_wheel
+%python_build

 %install
-%pyproject_install
+%python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}

 %check
-# gh#jbardin/scp.py#167
-#export SCPPY_PORT=10022
-#./.ci/setup_ssh.sh
-#%pyunittest -v || /bin/true
+# tests require running ssh server
+#%%python_exec -m unittest discover

 %files %{python_files}
 %license LICENSE.txt
 %doc README.rst
-%{python_sitelib}/scp.py
-%pycache_only %{python_sitelib}/__pycache__/scp*
-%{python_sitelib}/scp-%{version}*-info
+%{python_sitelib}/*

 %changelog
--- a/scp-0.13.2.tar.gz
+++ b/scp-0.13.2.tar.gz
--- a/scp-0.15.0.tar.gz
+++ b/scp-0.15.0.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe699c913ecb9f62713beba34f7fdd22e5b4485536746d722f79ff61041b9d44
-size 12616