#2 Remove python2 subpackage
Merged 3 years ago by chedi. Opened 3 years ago by jcapitao.
rpms/ jcapitao/python-scp master  into  master

file modified
+4 -34
@@ -3,7 +3,7 @@ 

  

  Name:           python-%{srcname}

  Version:        0.13.3

- Release:        1%{?dist}

+ Release:        2%{?dist}

  Summary:        Scp module for paramiko

  

  License:        LGPLv2+
@@ -18,22 +18,6 @@ 

  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

- %description -n python2-%{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.

- %endif

- 

  %package -n     python%{python3_pkgversion}-%{pypi_name}

  Summary:        scp module for paramiko

  BuildRequires:  python%{python3_pkgversion}-setuptools
@@ -53,32 +37,15 @@ 

  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

  # 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 python%{python3_pkgversion}-%{pypi_name}

  %doc README.rst PKG-INFO

  %license LICENSE.txt
@@ -87,6 +54,9 @@ 

  %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info

  

  %changelog

+ * Thu Nov 05 2020 Joel Capitao <jcapitao@redhat.com> - 0.13.3-2

+ - Remove python2 subpackage

+ 

  * Tue Oct 27 2020 Chedi Toueiti <chedi.toueiti@gmail.com> - 0.13.3-1

  - Update to 0.13.3

  

With the condition "0%{?fedora} < 30" the python2-subpackage is built in CBS [1].
I could add a condition to build python3-subpackage for %rhel, but it's better to remove
legacy code.

[1] https://cbs.centos.org/koji/taskinfo?taskID=1623360

Pull-Request has been merged by chedi

3 years ago