.gitignore

@@ -1 +1 @@
-SOURCES/PySocks-1.6.8.tar.gz
+SOURCES/PySocks-1.7.1.tar.gz

.python-pysocks.metadata

@@ -1 +1 @@
-f4292b91c78bc388616674cefbfeb01e9a1c903d SOURCES/PySocks-1.6.8.tar.gz
+439b5044af79748972675f3d9af1f4c91753d0db SOURCES/PySocks-1.7.1.tar.gz

SPECS/python-pysocks.spec

@@ -1,87 +1,190 @@
-%global distname PySocks
+%if 0%{?fedora}
-%global flatname pysocks
+%global with_python3_tests 1
+%endif
+
+%global pypi_name   PySocks
+%global modname     pysocks
 %global sum         A Python SOCKS client module
 
-Name:               python-pysocks
+Name:               python-%{modname}
-Version:            1.6.8
+Version:            1.7.1
-Release:            3%{?dist}
+Release:            12%{?dist}
 Summary:            %{sum}
 
 License:            BSD
-URL:                https://github.com/Anorov/PySocks
+URL:                https://github.com/Anorov/%{pypi_name}
-Source0:            https://files.pythonhosted.org/packages/source/P/PySocks/PySocks-%{version}.tar.gz
+Source0:            %pypi_source
 BuildArch:          noarch
 
+%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
-A fork of SocksiPy with bug fixes and extra features.
+%_description
-
-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 python%{python3_pkgversion}-%{flatname}
+%package -n python%{python3_pkgversion}-%{modname}
 Summary:            %{sum}
 BuildRequires:      python%{python3_pkgversion}-devel
 BuildRequires:      python%{python3_pkgversion}-setuptools
-BuildRequires:      python%{python3_pkgversion}-setuptools
+# for tests
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{flatname}}
+%if 0%{?with_python3_tests}
-
+BuildRequires:      python%{python3_pkgversion}-pytest
-# This package doesn't actually exist... but if it did, we would conflict with
+BuildRequires:      python%{python3_pkgversion}-psutil
-# it.
+#BuildRequires:      python%%{python3_pkgversion}-test_server
+%endif
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{modname}}
+
+# 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.
 
-%description -n python%{python3_pkgversion}-%{flatname}
+%if 0%{?python3_other_pkgversion}
-A fork of SocksiPy with bug fixes and extra features.
+%package -n python%{python3_other_pkgversion}-%{modname}
-
+Summary:            %{sum}
-Acts as a drop-in replacement to the socket module. Featuring:
+BuildRequires:      python%{python3_other_pkgversion}-devel
-
+BuildRequires:      python%{python3_other_pkgversion}-setuptools
-- SOCKS proxy client for Python 2.6 - 3.x
+# for tests
-- TCP and UDP both supported
+%if 0%{?with_python3_tests}
-- HTTP proxy client included but not supported or recommended (you should use
+BuildRequires:      python%{python3_other_pkgversion}-pytest
-  urllib2's or requests' own HTTP proxy interface)
+BuildRequires:      python%{python3_other_pkgversion}-psutil
-- urllib2 handler included.
+#BuildRequires:      python%%{python3_other_pkgversion}-test_server
+%endif
+%{?python_provide:%python_provide python%{python3_other_pkgversion}-%{modname}}
+
+%description -n python%{python3_other_pkgversion}-%{modname}
+%_description
+This package is for Python3 version %{python3_other_version} only.
+%endif
 
 
 %prep
-%autosetup -n %{distname}-%{version}
+%autosetup -n %{pypi_name}-%{version}
+# drop useless 3rdparty code
+rm -rfv test/bin
 
 %build
 %py3_build
-
+%{?python3_other_pkgversion: %py3_other_build}
 
 %install
 %py3_install
+%{?python3_other_pkgversion: %py3_other_install}
 
+%check
+# https://github.com/Anorov/PySocks/issues/37
+# FIXME python module named test_server is needed but not packaged
+%if 0
+%if 0%{?with_python3_tests}
+%{?with_python3: %{__python3} setup.py test}
+%{?python3_other_pkgversion: %{__python3_other} setup.py test}
+%endif
+%endif
 
-#%%check
-## No tests included in the tarball...
-## https://github.com/Anorov/PySocks/issues/37
-#%%{__python3} setup.py test
 
 
-%files -n python%{python3_pkgversion}-%{flatname}
+%files -n python%{python3_pkgversion}-%{modname}
 %doc README.md
 %license LICENSE
 %{python3_sitelib}/socks.py*
 %{python3_sitelib}/sockshandler.py*
 %{python3_sitelib}/__pycache__/*socks*
-%{python3_sitelib}/%{distname}-%{version}-*
+%{python3_sitelib}/%{pypi_name}-%{version}-*
+
+%if 0%{?python3_other_pkgversion}
+%files -n python%{python3_other_pkgversion}-%{modname}
+%doc README.md
+%license LICENSE
+%{python3_other_sitelib}/socks.py*
+%{python3_other_sitelib}/sockshandler.py*
+%{python3_other_sitelib}/__pycache__/*socks*
+%{python3_other_sitelib}/%{pypi_name}-%{version}-*
+%endif
 
 
 %changelog
-* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.6.8-3
+* Wed Feb 16 2022 Tomas Orsava <torsava@redhat.com> - 1.7.1-12
-- Rebuilt for MSVSphere 8.8
+- Add gating configuration and a simple smoke test
+- Related: rhbz#1950291
+
+* Tue Feb 08 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.7.1-11
+- Add automatically generated Obsoletes tag with the python39- prefix
+  for smoother upgrade from RHEL8
+- Related: rhbz#1990421
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.1-10
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.1-9
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 1.7.1-6
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 1.7.1-5
+- Bootstrap for Python 3.9
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Nov 24 2019 Miro Hrončok <mhroncok@redhat.com> - 1.7.1-3
+- Subpackage python2-pysocks has been removed
+  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
+
+* Thu Oct 03 2019 Petr Viktorin <pviktori@redhat.com> - 1.7.1-2
+- Remove unused Python 2 test dependencies
+
+* 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
 
-* Wed Jul 11 2018 Petr Viktorin <pviktori@redhat.com> - 1.6.8-3
+* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 1.6.8-3
-- Remove the Python 2 subpackage
+- Rebuilt for Python 3.7
-  https://bugzilla.redhat.com/show_bug.cgi?id=1590407
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild