rebuilt with python dist deps; restore -py36 subpackage [release 21.0.1-2mamba;Thu Mar 18 2021]

python-pip.spec

@@ -1,6 +1,6 @@
 Name:          python-pip
 Version:       21.0.1
-Release:       1mamba
+Release:       2mamba
 Summary:       A tool for installing and managing Python packages
 Group:         System/Libraries
 Vendor:        openmamba
@@ -10,25 +10,28 @@ URL:           https://www.pip-installer.org/
 Source:        http://pypi.debian.net/pip/pip-%{version}.tar.gz
 License:       MIT
 ## AUTOBUILDREQ-BEGIN
-BuildRequires: python3
+BuildRequires: libpython3-devel
+BuildRequires: python-setuptools-py3
 ## AUTOBUILDREQ-END
-BuildRequires: libpython3-devel >= 3.7.4
-Requires:	   python-setuptools
-Requires:      python >= %python_version
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 pip is a tool for installing and managing Python packages, such as those found in the Python Package Index. It’s a replacement for easy_install.
 
-%if "%{?with_pyver}"
+%if "%{?with_pyver}" != ""
+%if "%{?with_pyver}" == "3"
 %define py_requires_append \
 Requires:     python-setuptools%{?pyappend:-%pyappend} \
 Provides:     pip \
 Provides:     python-pip \
-Obsoletes:    python-pip < 20.3 \
-Obsoletes:    python-pip-py36 <= 20.3
+Obsoletes:    python-pip < 20.3
 %pyver_package
 %endif
+%if "%{?with_pyver}" != "3"
+%define py_requires_append \
+Requires:     python-setuptools%{?pyappend:-%pyappend}
+%pyver_package
+%endif
+%endif
 
 %prep
 %setup -q -n pip-%{version}
@@ -46,21 +49,24 @@ CFLAGS="%{optflags}" %{__python} setup.py build
    --single-version-externally-managed \
    --record=%{name}.filelist
 
-#sed -i "\,\.egg-info/,d;s,.*/man/.*,&.gz," %{name}.filelist
+sed -i "\,\.egg-info/,d;s,.*/man/.*,&.gz," %{name}.filelist
 
-#%if "%{?pyappend}"
-#rm -f %{buildroot}%{_bindir}/pip
-#sed -i "\,%{_bindir}/pip$,d" %{name}.filelist
-#%endif
-
-%posttrans %{?pyappend} 
-find %{python_sitearch}/*.egg-info -type d -empty -exec rmdir {} \;
-:
+%if "%{?with_pyver}" != "3"
+rm -f %{buildroot}%{_bindir}/pip
+sed -i "\,%{_bindir}/pip$,d" %{name}.filelist
+rm -f %{buildroot}%{_bindir}/pip3
+sed -i "\,%{_bindir}/pip3$,d" %{name}.filelist
+%endif
 
 %files %{?pyappend} -f %{name}.filelist
 %defattr(-,root,root)
+%dir %{python_sitearch}/pip-%{version}-py*.egg-info
+%{python_sitearch}/pip-%{version}-py*.egg-info/*
 
 %changelog
+* Thu Mar 18 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 21.0.1-2mamba
+- rebuilt with python dist deps; restore -py36 subpackage
+
 * Sun Feb 21 2021 Automatic Build System <autodist@mambasoft.it> 21.0.1-1mamba
 - automatic version update by autodist