SPECS/python-pysocks.spec

@@ -1,6 +1,4 @@
-%if 0%{?fedora}
+%bcond_with tests
-%global with_python3_tests 1
-%endif
 
 %global pypi_name   PySocks
 %global modname     pysocks
@@ -8,13 +6,17 @@
 
 Name:               python-%{modname}
 Version:            1.7.1
-Release:            12%{?dist}
+Release:            4%{?dist}
 Summary:            %{sum}
 
 License:            BSD
 URL:                https://github.com/Anorov/%{pypi_name}
 Source0:            %pypi_source
 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.\
@@ -30,13 +32,13 @@ Acts as a drop-in replacement to the socket module. Featuring:\
 %description
 %_description
 
-
 %package -n python%{python3_pkgversion}-%{modname}
 Summary:            %{sum}
 BuildRequires:      python%{python3_pkgversion}-devel
+BuildRequires:      python%{python3_pkgversion}-rpm-macros
 BuildRequires:      python%{python3_pkgversion}-setuptools
 # for tests
-%if 0%{?with_python3_tests}
+%if %{with tests}
 BuildRequires:      python%{python3_pkgversion}-pytest
 BuildRequires:      python%{python3_pkgversion}-psutil
 #BuildRequires:      python%%{python3_pkgversion}-test_server
@@ -51,25 +53,6 @@ Conflicts:  python%{python3_pkgversion}-SocksiPy
 %_description
 This package is for Python3 version %{python3_version} only.
 
-%if 0%{?python3_other_pkgversion}
-%package -n python%{python3_other_pkgversion}-%{modname}
-Summary:            %{sum}
-BuildRequires:      python%{python3_other_pkgversion}-devel
-BuildRequires:      python%{python3_other_pkgversion}-setuptools
-# for tests
-%if 0%{?with_python3_tests}
-BuildRequires:      python%{python3_other_pkgversion}-pytest
-BuildRequires:      python%{python3_other_pkgversion}-psutil
-#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 %{pypi_name}-%{version}
 # drop useless 3rdparty code
@@ -77,23 +60,14 @@ 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
+%if %{with tests}
-# FIXME python module named test_server is needed but not packaged
+%{__python3} setup.py test
-%if 0
-%if 0%{?with_python3_tests}
-%{?with_python3: %{__python3} setup.py test}
-%{?python3_other_pkgversion: %{__python3_other} setup.py test}
 %endif
-%endif
-
-
 
 %files -n python%{python3_pkgversion}-%{modname}
 %doc README.md
@@ -103,52 +77,12 @@ rm -rfv test/bin
 %{python3_sitelib}/__pycache__/*socks*
 %{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 Feb 16 2022 Tomas Orsava <torsava@redhat.com> - 1.7.1-12
+* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 1.7.1-4
-- Add gating configuration and a simple smoke test
+- Exclude unsupported i686 arch
-- Related: rhbz#1950291
 
-* Tue Feb 08 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 1.7.1-11
+* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 1.7.1-3
-- Add automatically generated Obsoletes tag with the python39- prefix
+- Adjusted for Python 3.8 module in RHEL 8
-  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