3 changed files with 106 additions and 135 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/PySocks-1.7.1.tar.gz
+SOURCES/PySocks-1.6.8.tar.gz
--- a/.python-pysocks.metadata
+++ b/.python-pysocks.metadata
@ -1 +1 @@
-439b5044af79748972675f3d9af1f4c91753d0db SOURCES/PySocks-1.7.1.tar.gz
+f4292b91c78bc388616674cefbfeb01e9a1c903d SOURCES/PySocks-1.6.8.tar.gz
--- a/SPECS/python-pysocks.spec
+++ b/SPECS/python-pysocks.spec
@ -1,165 +1,136 @@
-%bcond_with tests
+%bcond_without python3

-%global pypi_name   PySocks
-%global modname     pysocks
-%global sum         A Python SOCKS client module
+%global distname PySocks
+%global flatname pysocks
+%global sum     A Python SOCKS client module

-Name:               python-%{modname}
-Version:            1.7.1
-Release:            4%{?dist}
+Name:               python-pysocks
+Version:            1.6.8
+Release:            6%{?dist}
 Summary:            %{sum}

 License:            BSD
-URL:                https://github.com/Anorov/%{pypi_name}
-Source0:            %pypi_source
+URL:                https://github.com/Anorov/PySocks
+Source0:            https://files.pythonhosted.org/packages/source/P/PySocks/PySocks-%{version}.tar.gz
 BuildArch:          noarch
-# Exclude i686 arch. Due to a modularity issue it's being added to the
-# x86_64 compose of CRB, but we don't want to ship it at all.
-# See: https://projects.engineering.redhat.com/browse/RCM-72605
-ExcludeArch:        i686

-%global _description \
-A fork of SocksiPy with bug fixes and extra features.\
-\
-Acts as a drop-in replacement to the socket module. Featuring:\
-\
- SOCKS proxy client for Python 2.6 - 3.x\
- TCP and UDP both supported\
- HTTP proxy client included but not supported or recommended (you should use\
-  urllib2's or requests' own HTTP proxy interface)\
- urllib2 handler included.

 %description
-%_description
+A fork of SocksiPy with bug fixes and extra features.

-%package -n python%{python3_pkgversion}-%{modname}
+Acts as a drop-in replacement to the socket module. Featuring:
+
+- SOCKS proxy client for Python 2.6 - 3.x
+- TCP and UDP both supported
+- HTTP proxy client included but not supported or recommended (you should use
+  urllib2's or requests' own HTTP proxy interface)
+- urllib2 handler included.
+
+
+%package -n python2-%{flatname}
+Summary:            %{sum}
+BuildRequires:      python2-devel
+BuildRequires:      python2-setuptools
+%{?python_provide:%python_provide python2-%{flatname}}
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1334407
+Obsoletes:  python-SocksiPy
+Obsoletes:  python2-SocksiPy
+Provides:   python2-SocksiPy
+
+
+%description -n python2-%{flatname}
+A fork of SocksiPy with bug fixes and extra features.
+
+Acts as a drop-in replacement to the socket module. Featuring:
+
+- SOCKS proxy client for Python 2.6 - 3.x
+- TCP and UDP both supported
+- HTTP proxy client included but not supported or recommended (you should use
+  urllib2's or requests' own HTTP proxy interface)
+- urllib2 handler included.
+
+
+%if %{with python3}
+%package -n python%{python3_pkgversion}-%{flatname}
 Summary:            %{sum}
 BuildRequires:      python%{python3_pkgversion}-devel
-BuildRequires:      python%{python3_pkgversion}-rpm-macros
 BuildRequires:      python%{python3_pkgversion}-setuptools
-# for tests
-%if %{with tests}
-BuildRequires:      python%{python3_pkgversion}-pytest
-BuildRequires:      python%{python3_pkgversion}-psutil
-#BuildRequires:      python%%{python3_pkgversion}-test_server
-%endif
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}}
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{flatname}}

-# This package doesn't actually exist...
-# but if it did, we would conflict with it.
+# This package doesn't actually exist... but if it did, we would conflict with
+# it.
 Conflicts:  python%{python3_pkgversion}-SocksiPy

-%description -n python%{python3_pkgversion}-%{modname}
-%_description
-This package is for Python3 version %{python3_version} only.

-%prep
-%autosetup -n %{pypi_name}-%{version}
-# drop useless 3rdparty code
-rm -rfv test/bin
+%description -n python%{python3_pkgversion}-%{flatname}
+A fork of SocksiPy with bug fixes and extra features.

-%build
-%py3_build
+Acts as a drop-in replacement to the socket module. Featuring:

-%install
-%py3_install
+- SOCKS proxy client for Python 2.6 - 3.x
+- TCP and UDP both supported
+- HTTP proxy client included but not supported or recommended (you should use
+  urllib2's or requests' own HTTP proxy interface)
+- urllib2 handler included.

-%check
-%if %{with tests}
-%{__python3} setup.py test
 %endif

-%files -n python%{python3_pkgversion}-%{modname}
+%prep
+%autosetup -n %{distname}-%{version}
+
+%build
+%py2_build
+%if %{with python3}
+%py3_build
+%endif
+
+
+%install
+%py2_install
+%if %{with python3}
+%py3_install
+%endif
+
+
+#%%check
+## No tests included in the tarball...
+## https://github.com/Anorov/PySocks/issues/37
+#%%{__python2} setup.py test
+#%%if 0%%{?with_python3}
+#%%{__python3} setup.py test
+#%%endif
+
+
+%files -n python2-%{flatname}
+%doc README.md
+%license LICENSE
+%{python2_sitelib}/socks.py*
+%{python2_sitelib}/sockshandler.py*
+%{python2_sitelib}/%{distname}-%{version}*
+
+%if %{with python3}
+%files -n python%{python3_pkgversion}-%{flatname}
 %doc README.md
 %license LICENSE
 %{python3_sitelib}/socks.py*
 %{python3_sitelib}/sockshandler.py*
 %{python3_sitelib}/__pycache__/*socks*
-%{python3_sitelib}/%{pypi_name}-%{version}-*
+%{python3_sitelib}/%{distname}-%{version}-*
+%endif
+

 %changelog
-* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 1.7.1-4
- Exclude unsupported i686 arch
+* Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 1.6.8-6
+- Bumping due to problems with modular RPM upgrade path
+- Resolves: rhbz#1695587

-* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 1.7.1-3
- Adjusted for Python 3.8 module in RHEL 8
+* Mon Sep 17 2018 Tomas Orsava <torsava@redhat.com> - 1.6.8-5
+- Stop providing the unversioned name python-SocksiPy
+- Resolves: rhbz#1628242

-* Thu Oct 03 2019 Petr Viktorin <pviktori@redhat.com> - 1.7.1-2
- Remove unused Python 2 test dependencies
+* Tue Jul 31 2018 Lumír Balhar <lbalhar@redhat.com> - 1.6.8-4
+- Make possible to disable python3 subpackage

-* Sun Sep 22 2019 Kevin Fenzi <kevin@scrye.com> - 1.7.1-1
- Update to 1.7.1. Fixes bug #1753823
-
-* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 1.7.0-4
- Rebuilt for Python 3.8
-
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 1.7.0-3
- Bootstrap for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat May 18 2019 Kevin Fenzi <kevin@scrye.com> - 1.7.0-1
- Update to 1.7.0. Fixes bug #1708882
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.8-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sun Nov 11 2018 Kevin Fenzi <kevin@scrye.com> - 1.6.8-6
- Add upstream patch to avoid DeprecationWarning. Fixes bug #1648583
-
-* Wed Oct 03 2018 Raphael Groner <projects.rg@smart.ms> - 1.6.8-5
- add python3_other subpackage for epel7
- prepare removal of python2 subpackage in Fedora
- use pypi macros
- try to enable tests provided actually from tarball
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 1.6.8-3
- Rebuilt for Python 3.7
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Fri Dec 22 2017 Kevin Fenzi <kevin@scrye.com> - 1.6.8-1
- Update to 1.6.8. Fixes bug #1528490
-
-* Mon Sep 11 2017 Carl George <carl@george.computer> - 1.6.7-1
- Latest upstream
- Add setuptools dependency
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.7-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Dec 09 2016 Charalampos Stratakis <cstratak@redhat.com> - 1.5.7-3
- Rebuild for Python 3.6
-
-* Mon Nov 28 2016 Tim Orling <ticotimo@gmail.com> - 1.5.7-2
- Ship python34-pysocks in EL6
-
-* Sat Sep 17 2016 Kevin Fenzi <kevin@scrye.com> - 1.5.7-1
- Update to 1.5.7
-
-* Fri Sep 16 2016 Orion Poplawski <orion@cora.nwra.com> - 1.5.6-6
- Ship python34-pysocks in EPEL7
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.6-5
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Fri Jul 15 2016 Ralph Bean <rbean@redhat.com> - 1.5.6-4
- Change our conflicts on python-SocksiPy to an obsoletes/provides.
-  https://bugzilla.redhat.com/show_bug.cgi?id=1334407
-
-* Mon May 09 2016 Ralph Bean <rbean@redhat.com> - 1.5.6-3
- Fix typo in explicit conflicts.
-
-* Tue May 03 2016 Ralph Bean <rbean@redhat.com> - 1.5.6-2
- We don't actually need setuptools here.
-
-* Mon May 02 2016 Ralph Bean <rbean@redhat.com> - 1.5.6-1
- Initial package for Fedora
+* Mon Jul 16 2018 Lumír Balhar <lbalhar@redhat.com> - 1.6.8-3
+- First version for python27 module