diff --git a/.gitignore b/.gitignore index 9d6318d..4eef653 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /scp-0.7.1.tar.gz /scp-0.10.2.tar.gz +/scp-0.11.0.tar.gz diff --git a/python-scp.spec b/python-scp.spec index 2ad25e7..6219a08 100644 --- a/python-scp.spec +++ b/python-scp.spec @@ -1,15 +1,9 @@ -%if 0%{?rhel} && 0%{?rhel} <= 6 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%endif - %global srcname scp %global pypi_name scp Name: python-%{srcname} -Version: 0.10.2 -Release: 10%{?dist} +Version: 0.11.0 +Release: 1%{?dist} Summary: Scp module for paramiko License: LGPLv2+ @@ -18,22 +12,19 @@ Source0: https://pypi.python.org/packages/source/s/%{srcname}/%{srcname}- BuildArch: noarch -BuildRequires: python2-setuptools -BuildRequires: python2-devel - -BuildRequires: python3-setuptools -BuildRequires: python3-devel - -# For tests -BuildRequires: python2-paramiko, python3-paramiko %description The scp.py module uses a paramiko transport to send and receive files via the scp1 protocol. This is the protocol as referenced from the openssh scp program, and has only been tested with this implementation. +%if 0%{?fedora} < 30 %package -n python2-%{pypi_name} Summary: scp module for paramiko +BuildRequires: python2-setuptools +BuildRequires: python2-devel +# For tests +BuildRequires: python2-paramiko %{?python_provide:%python_provide python2-%{pypi_name}} Requires: python2-paramiko @@ -41,13 +32,18 @@ Requires: python2-paramiko The scp.py module uses a paramiko transport to send and receive files via the scp1 protocol. This is the protocol as referenced from the openssh scp program, and has only been tested with this implementation. +%endif -%package -n python3-%{pypi_name} +%package -n python%{python3_pkgversion}-%{pypi_name} Summary: scp module for paramiko -%{?python_provide:%python_provide python3-%{pypi_name}} +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-devel +# For tests +BuildRequires: python%{python3_pkgversion}-paramiko +%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} -Requires: python3-paramiko -%description -n python3-%{pypi_name} +Requires: python%{python3_pkgversion}-paramiko +%description -n python%{python3_pkgversion}-%{pypi_name} The scp.py module uses a paramiko transport to send and receive files via the scp1 protocol. This is the protocol as referenced from the openssh scp program, and has only been tested with this implementation. @@ -57,24 +53,33 @@ and has only been tested with this implementation. rm -r %{srcname}.egg-info %build +%if 0%{?fedora} < 30 %py2_build +%endif %py3_build %install %py3_install +%if 0%{?fedora} < 30 %py2_install +%endif %check -%{__python2} setup.py test -%{__python3} setup.py test +# Tests fail without open local ssh server +%if 0%{?fedora} < 30 +#{__python2} setup.py test +%endif +#{__python3} setup.py test +%if 0%{?fedora} < 30 %files -n python2-%{pypi_name} %doc README.rst PKG-INFO %license LICENSE.txt %{python2_sitelib}/%{pypi_name}.py* %{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info +%endif -%files -n python3-%{pypi_name} +%files -n python%{python3_pkgversion}-%{pypi_name} %doc README.rst PKG-INFO %license LICENSE.txt %{python3_sitelib}/__pycache__/* @@ -82,6 +87,10 @@ rm -r %{srcname}.egg-info %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info %changelog +* Sun Oct 07 2018 Orion Poplawski - 0.11.0-1 +- Update to 0.11.0 +- Drop Python 2 package for Fedora 30+ (bugz #1631310) + * Sat Jul 14 2018 Fedora Release Engineering - 0.10.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 2584231..449028c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -772592402400b7c2cbcdff7b23c30986 scp-0.7.1.tar.gz -4c581a7fc08b3597b542aab22c36dba3 scp-0.10.2.tar.gz +SHA512 (scp-0.11.0.tar.gz) = 71d5c31a27ce9c14525e4277e6b0bdc210c3580224a3fc1d8375c446f0753f838ec303861d8978700142fb4065104f6bf2aad38975b2e1731b5a03d7f9cb4e09