.gitignore

@@ -1 +1 @@
-SOURCES/chardet-3.0.4.tar.gz
+/chardet-3.0.4.tar.gz

.python-chardet.metadata

@@ -1 +0,0 @@
-4766fb07e700945a7085d073257f1f320d037ce8 SOURCES/chardet-3.0.4.tar.gz

SOURCES/174.patch

@@ -1,23 +0,0 @@
-From 0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Tue, 12 Mar 2019 18:44:36 +0100
-Subject: [PATCH] Support pytest 4, don't apply marks directly to parameters
-
-Fixes https://github.com/chardet/chardet/issues/173
----
- test.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test.py b/test.py
-index 9833307..ad2b753 100644
---- a/test.py
-+++ b/test.py
-@@ -59,7 +59,7 @@ def gen_test_params():
-             full_path = join(path, file_name)
-             test_case = full_path, encoding
-             if full_path in EXPECTED_FAILURES:
--                test_case = pytest.mark.xfail(test_case)
-+                test_case = pytest.param(*test_case, marks=pytest.mark.xfail)
-             yield test_case
- 
- 

SPECS/python-chardet.spec

@@ -1,187 +0,0 @@
-%global pypi_name chardet
-Name:           python-%{pypi_name}
-Version:        3.0.4
-Release:        19%{?dist}
-Summary:        Character encoding auto-detection in Python
-License:        LGPLv2
-URL:            https://github.com/%{pypi_name}/%{pypi_name}
-Source0:        %pypi_source
-
-# pytest 4 support
-Patch1:         https://github.com/chardet/chardet/pull/174.patch
-
-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
-
-BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-setuptools
-BuildRequires:  python%{python3_pkgversion}-rpm-macros
-
-# Circular dependency on pytest
-%bcond_without tests
-%if %{with tests}
-BuildRequires:  python%{python3_pkgversion}-pytest
-%endif
-
-
-%global _description\
-Character encoding auto-detection in Python. As\
-smart as your browser. Open source.
-
-%description %_description
-
-%package -n python%{python3_pkgversion}-%{pypi_name}
-Summary:        %{summary}
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
-Requires:  python%{python3_pkgversion}-setuptools
-
-%description -n python%{python3_pkgversion}-%{pypi_name} %_description
-
-%prep
-%autosetup -p1 -n %{pypi_name}-%{version}
-sed -ie '1d' %{pypi_name}/cli/chardetect.py
-
-%build
-%py3_build
-
-%install
-%py3_install
-mv %{buildroot}%{_bindir}/chardetect %{buildroot}%{_bindir}/chardetect-%{python3_version}
-
-%if %{with tests}
-%check
-%{__python3} -m pytest -v
-%endif
-
-%files -n python%{python3_pkgversion}-%{pypi_name}
-%license LICENSE
-%doc README.rst
-%{python3_sitelib}/%{pypi_name}/
-%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/
-%{_bindir}/chardetect-%{python3_version}
-
-
-%changelog
-* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 3.0.4-19
-- Exclude unsupported i686 arch
-
-* Thu Nov 28 2019 Lumír Balhar <lbalhar@redhat.com> - 3.0.4-18
-- Chardet requires setuptools
-
-* Fri Nov 22 2019 Lumír Balhar <lbalhar@redhat.com> - 3.0.4-17
-- Renamed chardetect → chardetect-3.8
-
-* Wed Nov 20 2019 Lumír Balhar <lbalhar@redhat.com> - 3.0.4-16
-- Rebuild with tests
-
-* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 3.0.4-15
-- Adjusted for Python 3.8 module in RHEL 8
-
-* Thu Nov 14 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-14
-- Subpackage python2-chardet has been removed
-  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-13
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-12
-- Rebuilt for Python 3.8
-
-* Wed Aug 14 2019 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-11
-- Bootstrap for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Aug 17 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-8
-- Only have one /usr/bin/chardetect
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-6
-- Rebuilt for Python 3.7
-
-* Sun Feb 11 2018 Iryna Shcherbina <ishcherb@redhat.com> - 3.0.4-5
-- Update Python 2 dependency declarations to new packaging standards
-  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.0.4-3
-- Python 2 binary package renamed to python2-chardet
-  See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue Jun 20 2017 Jeremy Cline <jeremy@jcline.org> - 3.0.4-1
-- Update to 3.0.4 (#1441436)
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Fri Dec 09 2016 Charalampos Stratakis <cstratak@redhat.com> - 2.3.0-2
-- Rebuild for Python 3.6
-
-* Wed Jul 27 2016 Miro Hrončok <mhroncok@redhat.com> - 2.3.0-1
-- Update to 2.3.0 (#1150536)
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-6
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Oct 14 2015 Robert Kuska <rkuska@redhat.com> - 2.2.1-4
-- Rebuilt for Python3.5 rebuild
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Jul 31 2014 Tom Callaway <spot@fedoraproject.org> - 2.2.1-2
-- fix license handling
-
-* Wed Jul 02 2014 Miro Hrončok <mhroncok@redhat.com> - 2.2.1-1
-- Updated to 2.2.1
-- Introduced Python 3 subpackage (upstream has merged the codebase)
-- Removed BuildRoot and python_sitelib definition
-- Use python2 macros instead of just python
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 2.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
-* Wed Jan 13 2010 Kushal Das <kushal@fedoraproject.org> 2.0.1-1
-- New release
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Aug 04 2008 Kushal Das <kushal@fedoraproject.org> 1.0.1-1
-- Initial release
-

python-chardet.spec

@@ -0,0 +1,106 @@
+%bcond_without python3
+%global pypi_name chardet
+Name:           python-%{pypi_name}
+Version:        3.0.4
+Release:        10%{?dist}
+Summary:        Character encoding auto-detection in Python
+
+Group:          Development/Languages
+License:        LGPLv2
+URL:            https://github.com/%{pypi_name}/%{pypi_name}
+Source0:        https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+
+BuildArch:      noarch
+BuildRequires:  python2-devel, python2-setuptools
+
+%if %{with python3}
+BuildRequires:  python3-devel, python3-setuptools
+%endif # with python3
+
+%global _description\
+Character encoding auto-detection in Python. As\
+smart as your browser. Open source.
+
+%description %_description
+
+%package -n python2-%{pypi_name}
+Summary: %summary
+%{?python_provide:%python_provide python2-%{pypi_name}}
+
+%description -n python2-%{pypi_name} %_description
+
+%if %{with python3}
+%package -n python3-%{pypi_name}
+Summary:        Character encoding auto-detection in Python 3
+
+%description -n python3-%{pypi_name}
+Character encoding auto-detection in Python. As 
+smart as your browser. Open source.
+
+Python 3 version.
+%endif # with python3
+
+%prep
+%setup -q -n %{pypi_name}-%{version}
+sed -ie '1d' %{pypi_name}/cli/chardetect.py
+
+%if %{with python3}
+rm -rf %{py3dir}
+cp -a . %{py3dir}
+%endif # with python3
+
+%build
+%{__python2} setup.py build
+
+%if %{with python3}
+pushd %{py3dir}
+%{__python3} setup.py build
+popd
+%endif # with python3
+
+
+%install
+# Do Python 3 first not to overwrite the entrypoint
+%if %{with python3}
+pushd %{py3dir}
+%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%{_bindir}/{,python3-}chardetect
+popd
+%endif # with python3
+
+%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%{_bindir}/chardetect{,-%{python2_version}}
+ln -s chardetect-%{python2_version} $RPM_BUILD_ROOT%{_bindir}/chardetect-2
+
+%files -n python2-%{pypi_name}
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README.rst
+%{python2_sitelib}/*
+%{_bindir}/chardetect-2
+%{_bindir}/chardetect-%{python2_version}
+
+%if %{with python3}
+%files -n python3-%{pypi_name}
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc README.rst
+%{python3_sitelib}/*
+%{_bindir}/python3-chardetect
+%endif # with python3
+
+
+%changelog
+* Thu Apr 25 2019 Tomas Orsava <torsava@redhat.com> - 3.0.4-10
+- Bumping due to problems with modular RPM upgrade path
+- Resolves: rhbz#1695587
+
+* Wed Aug 08 2018 Lumír Balhar <lbalhar@redhat.com> - 3.0.4-9
+- Remove unversioned binaries from python2 subpackage
+- Resolves: rhbz#1613343
+
+* Tue Jul 31 2018 Lumír Balhar <lbalhar@redhat.com> - 3.0.4-8
+- Switch python3 conditions to bcond
+
+* Mon Jul 16 2018 Lumír Balhar <lbalhar@redhat.com> - 3.0.4-7
+- First version for python27 module

sources

@@ -0,0 +1 @@
+SHA512 (chardet-3.0.4.tar.gz) = 61a03b23447a2bfe52ceed4dd1b9afdb5784da1933a623776883ee9f297e341f633e27f0ce0230bd5fdc5fdb5382105ab42736a74a417ddeb9f83af57455dba5