From 819c1db1cd24931c135ec68914bb82ed6ae6e685 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:31:53 +0000 Subject: [PATCH 01/93] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6b7cfc1..0b36b81 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: python-chardet -# $Id$ +# $Id: Makefile,v 1.1 2008/08/05 16:27:29 kevin Exp $ NAME := python-chardet SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 44e00cf7335e8e3c5cc5b635b4f7e073ea1a7bde Mon Sep 17 00:00:00 2001 From: Kushal Das Date: Wed, 7 Apr 2010 09:53:48 +0000 Subject: [PATCH 02/93] Updating to new release of 2.0.1 --- .cvsignore | 2 +- python-chardet.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 339d719..493b0ab 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -chardet-1.0.1.tgz +python2-chardet-2.0.1.tgz diff --git a/python-chardet.spec b/python-chardet.spec index d044d26..22b1eb6 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,16 +1,14 @@ -# sitelib for noarch packages, sitearch for others (remove the unneeded one) %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-chardet -Version: 1.0.1 -Release: 2%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages License: LGPLv2 URL: http://chardet.feedparser.org -Source0: http://chardet.feedparser.org/download/chardet-%{version}.tgz +Source0: http://chardet.feedparser.org/download/python2-chardet-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -21,7 +19,7 @@ Character encoding auto-detection in Python. As smart as your browser. Open source. %prep -%setup -q -n chardet-%{version} +%setup -q -n python2-chardet-%{version} @@ -47,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 13 2010 Kushal Das 2.0.1-1 +- New release + * Sun Jul 26 2009 Fedora Release Engineering - 1.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 371cedf..6ba688c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8c510a6fac300fe0ac9a0c24a76a7ba chardet-1.0.1.tgz +ec771971bab5dd1943a10362ebd2fd4c python2-chardet-2.0.1.tgz From 401ac81241171dd6a997eee8f6f76a79de614cc8 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 03:55:52 +0000 Subject: [PATCH 03/93] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 22b1eb6..0edf54b 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ Name: python-chardet Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 21 2010 David Malcolm - 2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Wed Jan 13 2010 Kushal Das 2.0.1-1 - New release From 0d0a7a428cd5c1061df988e4669b2fa2e0c39a15 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 10:14:18 +0000 Subject: [PATCH 04/93] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 0b36b81..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: python-chardet -# $Id: Makefile,v 1.1 2008/08/05 16:27:29 kevin Exp $ -NAME := python-chardet -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index e1d33c6..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -python-chardet-1_0_1-1_fc9:HEAD:python-chardet-1.0.1-1.fc9.src.rpm:1239526287 From cb6c147eedb4d31d73b60932d20972fec5e24173 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 21:13:07 -0600 Subject: [PATCH 05/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 0edf54b..890c986 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ Name: python-chardet Version: 2.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 2.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Jul 21 2010 David Malcolm - 2.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From 2108229038297a4e125e0b65c485470ae272447f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 19:37:05 -0600 Subject: [PATCH 06/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 890c986..c953133 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ Name: python-chardet Version: 2.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 2.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 2.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From f55b4c59c847623122d4a99b434b6da2b85e2700 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 00:18:44 -0500 Subject: [PATCH 07/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index c953133..d4952fe 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ Name: python-chardet Version: 2.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 2.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 2.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From d212b2f2a21d2817a1ff1ed0110610d68dab9dd9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 13:06:03 -0600 Subject: [PATCH 08/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index d4952fe..7be20b7 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ Name: python-chardet Version: 2.0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 2.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Jul 21 2012 Fedora Release Engineering - 2.0.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From caedaec44d761658f40593276bdad69815ceefae Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 01:41:03 -0500 Subject: [PATCH 09/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 7be20b7..a0a3adf 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ Name: python-chardet Version: 2.0.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 2.0.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 2.0.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From c6cc577ae0ed2dd19c9eb3f9f2711a4f66b38cbc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 14:03:30 -0500 Subject: [PATCH 10/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index a0a3adf..8cfbe48 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ Name: python-chardet Version: 2.0.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.0.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 2.0.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 5be0e0171b0838c4ef96e69e07bf009482dd99e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 2 Jul 2014 17:59:30 +0200 Subject: [PATCH 11/93] Updated, added python3 subpackage --- .gitignore | 1 + python-chardet.spec | 83 ++++++++++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 62 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 493b0ab..f5b65b0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ python2-chardet-2.0.1.tgz +/chardet-2.2.1.tar.gz diff --git a/python-chardet.spec b/python-chardet.spec index 8cfbe48..245b62b 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,50 +1,87 @@ -%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -Name: python-chardet -Version: 2.0.1 -Release: 8%{?dist} +%global with_python3 1 +%global pypi_name chardet +Name: python-%{pypi_name} +Version: 2.2.1 +Release: 1%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages License: LGPLv2 -URL: http://chardet.feedparser.org -Source0: http://chardet.feedparser.org/download/python2-chardet-%{version}.tgz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +URL: https://github.com/%{pypi_name}/%{pypi_name} +Source0: https://pypi.python.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python-devel, python-setuptools +BuildRequires: python2-devel, python-setuptools + +%if 0%{?with_python3} +BuildRequires: python3-devel, python3-setuptools +%endif # with_python3 %description Character encoding auto-detection in Python. As smart as your browser. Open source. +%if 0%{?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 python2-chardet-%{version} - +%setup -q -n %{pypi_name}-%{version} +sed -ie '1d' %{pypi_name}/chardetect.py +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +%endif # with_python3 %build -# Remove CFLAGS=... for noarch packages (unneeded) -%{__python} setup.py build +%{__python2} setup.py build + +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py build +popd +%endif # with_python3 %install -rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -chmod -x COPYING - -%clean -rm -rf $RPM_BUILD_ROOT +# Do Python 3 first not to overwrite the entrypoint +%if 0%{?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 %files -%defattr(-,root,root,-) -%doc COPYING -# For noarch packages: sitelib -%{python_sitelib}/* +%doc README.rst LICENSE +%{python2_sitelib}/* +%{_bindir}/chardetect + +%if 0%{?with_python3} +%files -n python3-%{pypi_name} +%doc README.rst LICENSE +%{python3_sitelib}/* +%{_bindir}/python3-chardetect +%endif # with_python3 %changelog +* Wed Jul 02 2014 Miro Hrončok - 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 - 2.0.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 6ba688c..e3a852e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ec771971bab5dd1943a10362ebd2fd4c python2-chardet-2.0.1.tgz +4a758402eaefd0331bdedc7ecb6f452c chardet-2.2.1.tar.gz From 1e01f3eec0d32e038861cc3e7f8f510c37544501 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 31 Jul 2014 10:02:24 -0400 Subject: [PATCH 12/93] fix license handling --- python-chardet.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index 245b62b..32895c8 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -63,19 +63,26 @@ popd %{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %files -%doc README.rst LICENSE +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc README.rst %{python2_sitelib}/* %{_bindir}/chardetect %if 0%{?with_python3} %files -n python3-%{pypi_name} -%doc README.rst LICENSE +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc README.rst %{python3_sitelib}/* %{_bindir}/python3-chardetect %endif # with_python3 %changelog +* Thu Jul 31 2014 Tom Callaway - 2.2.1-2 +- fix license handling + * Wed Jul 02 2014 Miro Hrončok - 2.2.1-1 - Updated to 2.2.1 - Introduced Python 3 subpackage (upstream has merged the codebase) From 1d11ce81ff7594fddd675011e1039787b3592ebc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 18:44:17 +0000 Subject: [PATCH 13/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 32895c8..8b3fb19 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 2.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -80,6 +80,9 @@ popd %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Jul 31 2014 Tom Callaway - 2.2.1-2 - fix license handling From 8bf0e9907d17b3cccc3ac708fe71c0a6ee0595f6 Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Wed, 14 Oct 2015 12:58:42 +0200 Subject: [PATCH 14/93] Rebuilt for Python3.5 rebuild --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 8b3fb19..06d908b 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 2.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -80,6 +80,9 @@ popd %changelog +* Wed Oct 14 2015 Robert Kuska - 2.2.1-4 +- Rebuilt for Python3.5 rebuild + * Thu Jun 18 2015 Fedora Release Engineering - 2.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 1428284b2b2064bde99931aec7246595e12216b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 19:11:38 +0000 Subject: [PATCH 15/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 06d908b..0d3c134 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 2.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -80,6 +80,9 @@ popd %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Oct 14 2015 Robert Kuska - 2.2.1-4 - Rebuilt for Python3.5 rebuild From ad2fc6b38d048a90f4ec34fe6f545ad53594ac8c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 09:12:32 +0000 Subject: [PATCH 16/93] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 0d3c134..ff9f91e 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 2.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -80,6 +80,9 @@ popd %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 2.2.1-6 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Thu Feb 04 2016 Fedora Release Engineering - 2.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 9973efd3a81ce6ed2ac9053b1dc03dea1c065ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 27 Jul 2016 12:08:34 +0200 Subject: [PATCH 17/93] Update to 2.3.0 (#1150536) --- .gitignore | 1 + python-chardet.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f5b65b0..a66ad29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ python2-chardet-2.0.1.tgz /chardet-2.2.1.tar.gz +/chardet-2.3.0.tar.gz diff --git a/python-chardet.spec b/python-chardet.spec index ff9f91e..6127cff 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,8 +1,8 @@ %global with_python3 1 %global pypi_name chardet Name: python-%{pypi_name} -Version: 2.2.1 -Release: 6%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -80,6 +80,9 @@ popd %changelog +* Wed Jul 27 2016 Miro Hrončok - 2.3.0-1 +- Update to 2.3.0 (#1150536) + * Tue Jul 19 2016 Fedora Release Engineering - 2.2.1-6 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/sources b/sources index e3a852e..6a19719 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a758402eaefd0331bdedc7ecb6f452c chardet-2.2.1.tar.gz +25274d664ccb5130adae08047416e1a8 chardet-2.3.0.tar.gz From 1577a13a8af5ef061e6875fcaabe081cd7014db8 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Sun, 11 Dec 2016 13:26:23 +0100 Subject: [PATCH 18/93] Rebuild for Python 3.6 --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 6127cff..05e024d 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -80,6 +80,9 @@ popd %changelog +* Fri Dec 09 2016 Charalampos Stratakis - 2.3.0-2 +- Rebuild for Python 3.6 + * Wed Jul 27 2016 Miro Hrončok - 2.3.0-1 - Update to 2.3.0 (#1150536) From 9e6423d7e6210dcc24bed2b377155b2c027996a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 08:34:05 +0000 Subject: [PATCH 19/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 05e024d..6589599 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -80,6 +80,9 @@ popd %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Dec 09 2016 Charalampos Stratakis - 2.3.0-2 - Rebuild for Python 3.6 From a956d8fe4009bb77a1c5e5911adc73a7d95a1da5 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 20 Jun 2017 14:55:43 -0400 Subject: [PATCH 20/93] Update to 3.0.4 Signed-off-by: Jeremy Cline --- .gitignore | 1 + python-chardet.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a66ad29..403b5b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ python2-chardet-2.0.1.tgz /chardet-2.2.1.tar.gz /chardet-2.3.0.tar.gz +/chardet-3.0.4.tar.gz diff --git a/python-chardet.spec b/python-chardet.spec index 6589599..437fa64 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,14 +1,14 @@ %global with_python3 1 %global pypi_name chardet Name: python-%{pypi_name} -Version: 2.3.0 -Release: 3%{?dist} +Version: 3.0.4 +Release: 1%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages License: LGPLv2 URL: https://github.com/%{pypi_name}/%{pypi_name} -Source0: https://pypi.python.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Source0: https://files.pythonhosted.org/packages/source/c/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch BuildRequires: python2-devel, python-setuptools @@ -80,6 +80,9 @@ popd %changelog +* Tue Jun 20 2017 Jeremy Cline - 3.0.4-1 +- Update to 3.0.4 (#1441436) + * Sat Feb 11 2017 Fedora Release Engineering - 2.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 6a19719..53fca90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -25274d664ccb5130adae08047416e1a8 chardet-2.3.0.tar.gz +SHA512 (chardet-3.0.4.tar.gz) = 61a03b23447a2bfe52ceed4dd1b9afdb5784da1933a623776883ee9f297e341f633e27f0ce0230bd5fdc5fdb5382105ab42736a74a417ddeb9f83af57455dba5 From 5737c81db4f5ac4cb9e96d9d61b011aee4c1a55d Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Tue, 20 Jun 2017 15:09:06 -0400 Subject: [PATCH 21/93] Adjust the sed call since chardetect.py moved Signed-off-by: Jeremy Cline --- python-chardet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 437fa64..47e7a28 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -34,7 +34,7 @@ Python 3 version. %prep %setup -q -n %{pypi_name}-%{version} -sed -ie '1d' %{pypi_name}/chardetect.py +sed -ie '1d' %{pypi_name}/cli/chardetect.py %if 0%{?with_python3} rm -rf %{py3dir} From 22714874934971d9026b23d1874a1ea1b76cd110 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 09:51:20 +0000 Subject: [PATCH 22/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 47e7a28..98bed06 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -80,6 +80,9 @@ popd %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Tue Jun 20 2017 Jeremy Cline - 3.0.4-1 - Update to 3.0.4 (#1441436) From fba4f3316dd46fc0afedde8b432bab4ff48d1f89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 19 Aug 2017 09:39:52 -0400 Subject: [PATCH 23/93] Python 2 binary package renamed to python2-chardet --- python-chardet.spec | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index 98bed06..5e52241 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -17,10 +17,18 @@ BuildRequires: python2-devel, python-setuptools BuildRequires: python3-devel, python3-setuptools %endif # with_python3 -%description -Character encoding auto-detection in Python. As +%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 0%{?with_python3} %package -n python3-%{pypi_name} Summary: Character encoding auto-detection in Python 3 @@ -62,7 +70,7 @@ popd %{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT -%files +%files -n python2-%{pypi_name} %{!?_licensedir:%global license %%doc} %license LICENSE %doc README.rst @@ -80,6 +88,10 @@ popd %changelog +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 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 - 3.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 5eba2c4cd27ee21b248fac0cf2a8c6f992d73518 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 07:02:35 +0000 Subject: [PATCH 24/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 5e52241..d00b52c 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -88,6 +88,9 @@ popd %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 3.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 3.0.4-3 - Python 2 binary package renamed to python2-chardet See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 From e30d288e7f1cf87653892fd0e3645b789872fe63 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Mon, 12 Feb 2018 00:44:02 +0100 Subject: [PATCH 25/93] Update Python 2 dependency declarations to new packaging standards --- python-chardet.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index d00b52c..380ef12 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -11,7 +11,7 @@ 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, python-setuptools +BuildRequires: python2-devel, python2-setuptools %if 0%{?with_python3} BuildRequires: python3-devel, python3-setuptools @@ -88,6 +88,10 @@ popd %changelog +* Sun Feb 11 2018 Iryna Shcherbina - 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 - 3.0.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b174f7e6a8bf930d8d1c0d093cccf8f7622b04fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 14 Jun 2018 00:36:32 +0200 Subject: [PATCH 26/93] Rebuilt for Python 3.7 --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 380ef12..c417253 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -88,6 +88,9 @@ popd %changelog +* Wed Jun 13 2018 Miro Hrončok - 3.0.4-6 +- Rebuilt for Python 3.7 + * Sun Feb 11 2018 Iryna Shcherbina - 3.0.4-5 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 481b4eaf246366bedc9b2bc0218b2674dfbb21b4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 23:45:51 +0000 Subject: [PATCH 27/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index c417253..067788b 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Character encoding auto-detection in Python Group: Development/Languages @@ -88,6 +88,9 @@ popd %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 3.0.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jun 13 2018 Miro Hrončok - 3.0.4-6 - Rebuilt for Python 3.7 From 631a7704b860bf9989ef4c0ffb791395baaa8af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 17 Aug 2018 14:16:55 +0200 Subject: [PATCH 28/93] Modernize spec - only ship one version of the executable - run tests - drop python3 conditional - use mdoern macros - don't do py3dir - remove Group definition --- python-chardet.spec | 66 ++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 40 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index 067788b..12b0fd1 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,21 +1,21 @@ -%global with_python3 1 %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 7%{?dist} +Release: 8%{?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 +Source0: %pypi_source BuildArch: noarch -BuildRequires: python2-devel, python2-setuptools +BuildRequires: python2-devel +BuildRequires: python2-setuptools +BuildRequires: python2-pytest + +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-pytest -%if 0%{?with_python3} -BuildRequires: python3-devel, python3-setuptools -%endif # with_python3 %global _description\ Character encoding auto-detection in Python. As\ @@ -29,65 +29,51 @@ Summary: %summary %description -n python2-%{pypi_name} %_description -%if 0%{?with_python3} %package -n python3-%{pypi_name} Summary: Character encoding auto-detection in Python 3 +%{?python_provide:%python_provide python3-%{pypi_name}} %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 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -%endif # with_python3 - %build -%{__python2} setup.py build - -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py build -popd -%endif # with_python3 - +%py2_build +%py3_build %install -# Do Python 3 first not to overwrite the entrypoint -%if 0%{?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 +%py2_install +rm %{buildroot}%{_bindir}/* +%py3_install -%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%check +%{__python2} -m pytest -v +%{__python3} -m pytest -v %files -n python2-%{pypi_name} -%{!?_licensedir:%global license %%doc} %license LICENSE %doc README.rst -%{python2_sitelib}/* -%{_bindir}/chardetect +%{python2_sitelib}/%{pypi_name}/ +%{python2_sitelib}/%{pypi_name}-%{version}-py%{python2_version}.egg-info/ -%if 0%{?with_python3} %files -n python3-%{pypi_name} -%{!?_licensedir:%global license %%doc} %license LICENSE %doc README.rst -%{python3_sitelib}/* -%{_bindir}/python3-chardetect -%endif # with_python3 +%{python3_sitelib}/%{pypi_name}/ +%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/ +%{_bindir}/chardetect %changelog +* Fri Aug 17 2018 Miro Hrončok - 3.0.4-8 +- Only have one /usr/bin/chardetect + * Fri Jul 13 2018 Fedora Release Engineering - 3.0.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 13a39db9502ab8e27da61d7970b278decf3a195d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 06:03:27 +0000 Subject: [PATCH 29/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 12b0fd1..b7806e0 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,7 +1,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/%{pypi_name}/%{pypi_name} @@ -71,6 +71,9 @@ rm %{buildroot}%{_bindir}/* %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 3.0.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Aug 17 2018 Miro Hrončok - 3.0.4-8 - Only have one /usr/bin/chardetect From 0d57d4096df2dfe1cd49b0475921ec32f7c98732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 11 Mar 2019 07:47:51 +0100 Subject: [PATCH 30/93] Circular dependency on pytest, add bcond --- python-chardet.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index b7806e0..c002fb5 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -10,11 +10,16 @@ Source0: %pypi_source BuildArch: noarch BuildRequires: python2-devel BuildRequires: python2-setuptools -BuildRequires: python2-pytest BuildRequires: python3-devel BuildRequires: python3-setuptools + +# Circular dependency on pytest +%bcond_without tests +%if %{with tests} +BuildRequires: python2-pytest BuildRequires: python3-pytest +%endif %global _description\ @@ -52,9 +57,11 @@ sed -ie '1d' %{pypi_name}/cli/chardetect.py rm %{buildroot}%{_bindir}/* %py3_install +%if %{with tests} %check %{__python2} -m pytest -v %{__python3} -m pytest -v +%endif %files -n python2-%{pypi_name} %license LICENSE From 31fb39b3ae309bcb92e1ba7e3828a0807ff3d85e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 12 Mar 2019 18:53:12 +0100 Subject: [PATCH 31/93] Support pytest 4 (#1687942) --- 174.patch | 23 +++++++++++++++++++++++ python-chardet.spec | 5 ++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 174.patch diff --git a/174.patch b/174.patch new file mode 100644 index 0000000..eef88e9 --- /dev/null +++ b/174.patch @@ -0,0 +1,23 @@ +From 0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +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 + + diff --git a/python-chardet.spec b/python-chardet.spec index c002fb5..33a1346 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -7,6 +7,9 @@ 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 BuildRequires: python2-devel BuildRequires: python2-setuptools @@ -45,7 +48,7 @@ smart as your browser. Open source. Python 3 version. %prep -%setup -q -n %{pypi_name}-%{version} +%autosetup -p1 -n %{pypi_name}-%{version} sed -ie '1d' %{pypi_name}/cli/chardetect.py %build From a860223f548a77d83fcaef6a7a2cf591d7c9f4e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 12:38:19 +0000 Subject: [PATCH 32/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 33a1346..d9219e9 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,7 +1,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/%{pypi_name}/%{pypi_name} @@ -81,6 +81,9 @@ rm %{buildroot}%{_bindir}/* %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 3.0.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Feb 02 2019 Fedora Release Engineering - 3.0.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ef4c7330c8a3f0fc75b31a9ede6f1bed31b4a25e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 14 Aug 2019 23:58:51 +0200 Subject: [PATCH 33/93] Bootstrap for Python 3.8 --- python-chardet.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index d9219e9..3ed6349 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,7 +1,8 @@ +%global _without_tests 1 %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/%{pypi_name}/%{pypi_name} @@ -81,6 +82,9 @@ rm %{buildroot}%{_bindir}/* %changelog +* Wed Aug 14 2019 Miro Hrončok - 3.0.4-11 +- Bootstrap for Python 3.8 + * Fri Jul 26 2019 Fedora Release Engineering - 3.0.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From d947672d8ff58ea41c9bf2c5380a3e3c9e6eaa0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 15 Aug 2019 15:41:37 +0200 Subject: [PATCH 34/93] Rebuilt for Python 3.8 --- python-chardet.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index 3ed6349..4ba90ec 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,8 +1,7 @@ -%global _without_tests 1 %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/%{pypi_name}/%{pypi_name} @@ -82,6 +81,9 @@ rm %{buildroot}%{_bindir}/* %changelog +* Thu Aug 15 2019 Miro Hrončok - 3.0.4-12 +- Rebuilt for Python 3.8 + * Wed Aug 14 2019 Miro Hrončok - 3.0.4-11 - Bootstrap for Python 3.8 From 19290cb937c7e50c896c8656441e99b00bd4315d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 3 Oct 2019 14:05:42 +0200 Subject: [PATCH 35/93] Rebuilt for Python 3.8.0rc1 (#1748018) --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 4ba90ec..4ae84f0 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,7 +1,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/%{pypi_name}/%{pypi_name} @@ -81,6 +81,9 @@ rm %{buildroot}%{_bindir}/* %changelog +* Thu Oct 03 2019 Miro Hrončok - 3.0.4-13 +- Rebuilt for Python 3.8.0rc1 (#1748018) + * Thu Aug 15 2019 Miro Hrončok - 3.0.4-12 - Rebuilt for Python 3.8 From 4a8271ecba4b26ee798334ab9eedff33fbf73813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 14 Nov 2019 11:01:17 +0100 Subject: [PATCH 36/93] Subpackage python2-chardet has been removed --- python-chardet.spec | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index 4ae84f0..168066d 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,7 +1,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/%{pypi_name}/%{pypi_name} @@ -11,8 +11,6 @@ Source0: %pypi_source Patch1: https://github.com/chardet/chardet/pull/174.patch BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python2-setuptools BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -20,7 +18,6 @@ BuildRequires: python3-setuptools # Circular dependency on pytest %bcond_without tests %if %{with tests} -BuildRequires: python2-pytest BuildRequires: python3-pytest %endif @@ -31,47 +28,27 @@ 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 - %package -n python3-%{pypi_name} -Summary: Character encoding auto-detection in Python 3 +Summary: %{summary} %{?python_provide:%python_provide python3-%{pypi_name}} -%description -n python3-%{pypi_name} -Character encoding auto-detection in Python. As -smart as your browser. Open source. - -Python 3 version. +%description -n python3-%{pypi_name} %_description %prep %autosetup -p1 -n %{pypi_name}-%{version} sed -ie '1d' %{pypi_name}/cli/chardetect.py %build -%py2_build %py3_build %install -%py2_install -rm %{buildroot}%{_bindir}/* %py3_install %if %{with tests} %check -%{__python2} -m pytest -v %{__python3} -m pytest -v %endif -%files -n python2-%{pypi_name} -%license LICENSE -%doc README.rst -%{python2_sitelib}/%{pypi_name}/ -%{python2_sitelib}/%{pypi_name}-%{version}-py%{python2_version}.egg-info/ - %files -n python3-%{pypi_name} %license LICENSE %doc README.rst @@ -81,6 +58,10 @@ rm %{buildroot}%{_bindir}/* %changelog +* Thu Nov 14 2019 Miro Hrončok - 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 - 3.0.4-13 - Rebuilt for Python 3.8.0rc1 (#1748018) From 9f6cb06a91c3b39f951c7e782925187a8b78e4d9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 11:09:44 +0000 Subject: [PATCH 37/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 168066d..f5537eb 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,7 +1,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/%{pypi_name}/%{pypi_name} @@ -58,6 +58,9 @@ sed -ie '1d' %{pypi_name}/cli/chardetect.py %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 3.0.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Nov 14 2019 Miro Hrončok - 3.0.4-14 - Subpackage python2-chardet has been removed See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal From c7732f881c259192cddd7b6bf3b03e42b6b0eb42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 22 May 2020 04:35:29 +0200 Subject: [PATCH 38/93] Bootstrap for Python 3.9 --- python-chardet.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index f5537eb..7a68b86 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,7 +1,8 @@ +%global _without_tests 1 %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/%{pypi_name}/%{pypi_name} @@ -58,6 +59,9 @@ sed -ie '1d' %{pypi_name}/cli/chardetect.py %changelog +* Fri May 22 2020 Miro Hrončok - 3.0.4-16 +- Bootstrap for Python 3.9 + * Thu Jan 30 2020 Fedora Release Engineering - 3.0.4-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 5c191bbe10bbb3d0907cc179ad0b8dddc03c12cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 22 May 2020 15:50:49 +0200 Subject: [PATCH 39/93] Rebuilt for Python 3.9 --- python-chardet.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index 7a68b86..fa44b36 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,8 +1,7 @@ -%global _without_tests 1 %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/%{pypi_name}/%{pypi_name} @@ -59,6 +58,9 @@ sed -ie '1d' %{pypi_name}/cli/chardetect.py %changelog +* Fri May 22 2020 Miro Hrončok - 3.0.4-17 +- Rebuilt for Python 3.9 + * Fri May 22 2020 Miro Hrončok - 3.0.4-16 - Bootstrap for Python 3.9 From 2a8b62bcef46cebe70c8a2ad3390080e44cb104a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 00:08:08 +0000 Subject: [PATCH 40/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index fa44b36..cb12146 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,7 +1,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/%{pypi_name}/%{pypi_name} @@ -58,6 +58,9 @@ sed -ie '1d' %{pypi_name}/cli/chardetect.py %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 3.0.4-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri May 22 2020 Miro Hrončok - 3.0.4-17 - Rebuilt for Python 3.9 From 1f30dbfcead8eb3edf9bb6c53b263024ea8a570a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 09:47:01 +0000 Subject: [PATCH 41/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index cb12146..5a1c4d1 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,7 +1,7 @@ %global pypi_name chardet Name: python-%{pypi_name} Version: 3.0.4 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/%{pypi_name}/%{pypi_name} @@ -58,6 +58,9 @@ sed -ie '1d' %{pypi_name}/cli/chardetect.py %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.0.4-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 3.0.4-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 6770299bbca4ef9def6f9089b2f5eeb3899cb4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 5 Feb 2021 11:55:12 +0100 Subject: [PATCH 42/93] Update to 4.0.0 --- .gitignore | 1 + 174.patch | 23 ----------------------- python-chardet.spec | 17 +++++++++++------ sources | 2 +- 4 files changed, 13 insertions(+), 30 deletions(-) delete mode 100644 174.patch diff --git a/.gitignore b/.gitignore index 403b5b8..c0db42f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ python2-chardet-2.0.1.tgz /chardet-2.2.1.tar.gz /chardet-2.3.0.tar.gz /chardet-3.0.4.tar.gz +/chardet-4.0.0.tar.gz diff --git a/174.patch b/174.patch deleted file mode 100644 index eef88e9..0000000 --- a/174.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -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 - - diff --git a/python-chardet.spec b/python-chardet.spec index 5a1c4d1..d56763d 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,15 +1,12 @@ %global pypi_name chardet Name: python-%{pypi_name} -Version: 3.0.4 -Release: 19%{?dist} +Version: 4.0.0 +Release: 1%{?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 BuildRequires: python3-devel @@ -36,7 +33,10 @@ Summary: %{summary} %prep %autosetup -p1 -n %{pypi_name}-%{version} -sed -ie '1d' %{pypi_name}/cli/chardetect.py + +# Remove useless shebangs +# https://github.com/chardet/chardet/commit/1e94b33329 +grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" %build %py3_build @@ -58,6 +58,11 @@ sed -ie '1d' %{pypi_name}/cli/chardetect.py %changelog +* Fri Feb 05 2021 Miro Hrončok - 4.0.0-1 +- Update to 4.0.0 +- Fixes: rhbz#1906585 +- Fixes: rhbz#1923076 + * Wed Jan 27 2021 Fedora Release Engineering - 3.0.4-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 53fca90..dad62a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chardet-3.0.4.tar.gz) = 61a03b23447a2bfe52ceed4dd1b9afdb5784da1933a623776883ee9f297e341f633e27f0ce0230bd5fdc5fdb5382105ab42736a74a417ddeb9f83af57455dba5 +SHA512 (chardet-4.0.0.tar.gz) = ebd7f420e1094445270db993f6373ffe7370419e002b0bb13299dc6c9b0f7c4e77b0f44f871fba6371e6869e7c86728514367db377e3137487a3acf50cb81e96 From 73037ec629f34a0708ac71e3909bf16af1ca8c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 5 Feb 2021 12:03:12 +0100 Subject: [PATCH 43/93] Convert to pyproject-rpm-macros --- .gitignore | 7 ++----- python-chardet.spec | 40 +++++++++++++++++++++++----------------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index c0db42f..bb18b7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,2 @@ -python2-chardet-2.0.1.tgz -/chardet-2.2.1.tar.gz -/chardet-2.3.0.tar.gz -/chardet-3.0.4.tar.gz -/chardet-4.0.0.tar.gz +/chardet-*.tar.gz +/chardet-*/ diff --git a/python-chardet.spec b/python-chardet.spec index d56763d..cb8a3ec 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,16 +1,15 @@ -%global pypi_name chardet -Name: python-%{pypi_name} +Name: python-chardet Version: 4.0.0 Release: 1%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 -URL: https://github.com/%{pypi_name}/%{pypi_name} -Source0: %pypi_source +URL: https://github.com/chardet/chardet +Source0: %{pypi_source chardet} BuildArch: noarch BuildRequires: python3-devel -BuildRequires: python3-setuptools +BuildRequires: pyproject-rpm-macros # Circular dependency on pytest %bcond_without tests @@ -18,42 +17,49 @@ BuildRequires: python3-setuptools BuildRequires: python3-pytest %endif - %global _description\ Character encoding auto-detection in Python. As\ smart as your browser. Open source. %description %_description -%package -n python3-%{pypi_name} -Summary: %{summary} -%{?python_provide:%python_provide python3-%{pypi_name}} -%description -n python3-%{pypi_name} %_description +%package -n python3-chardet +Summary: %{summary} + +%description -n python3-chardet %_description + %prep -%autosetup -p1 -n %{pypi_name}-%{version} +%autosetup -p1 -n chardet-%{version} # Remove useless shebangs # https://github.com/chardet/chardet/commit/1e94b33329 grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" + +%generate_buildrequires +%pyproject_buildrequires -r + + %build -%py3_build +%pyproject_wheel + %install -%py3_install +%pyproject_install +%pyproject_save_files chardet + %if %{with tests} %check -%{__python3} -m pytest -v +%pytest -v %endif -%files -n python3-%{pypi_name} + +%files -n python3-chardet -f %{pyproject_files} %license LICENSE %doc README.rst -%{python3_sitelib}/%{pypi_name}/ -%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info/ %{_bindir}/chardetect From dfeac08817f20fc48706eae4f140708a8ceafff7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 2 Jun 2021 11:13:30 +0200 Subject: [PATCH 44/93] Bootstrap for Python 3.10 --- python-chardet.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index cb8a3ec..fca2c60 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,6 +1,7 @@ +%global _without_tests 1 Name: python-chardet Version: 4.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/chardet/chardet @@ -64,6 +65,9 @@ grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" %changelog +* Wed Jun 02 2021 Python Maint - 4.0.0-2 +- Bootstrap for Python 3.10 + * Fri Feb 05 2021 Miro Hrončok - 4.0.0-1 - Update to 4.0.0 - Fixes: rhbz#1906585 From 648edbafb2ce3ea83fc3c93115bfa9fa8c5c8f15 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 2 Jun 2021 17:02:14 +0200 Subject: [PATCH 45/93] Rebuilt for Python 3.10 --- python-chardet.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index fca2c60..4fa2463 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,7 +1,6 @@ -%global _without_tests 1 Name: python-chardet Version: 4.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/chardet/chardet @@ -65,6 +64,9 @@ grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" %changelog +* Wed Jun 02 2021 Python Maint - 4.0.0-3 +- Rebuilt for Python 3.10 + * Wed Jun 02 2021 Python Maint - 4.0.0-2 - Bootstrap for Python 3.10 From d621a0aae02498d91c727a39c87ab9f95b6af6b3 Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Fri, 2 Jul 2021 12:40:44 +0200 Subject: [PATCH 46/93] Run pipenv tests on package update --- .fmf/version | 1 + plans/pipenv.fmf | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/pipenv.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/pipenv.fmf b/plans/pipenv.fmf new file mode 100644 index 0000000..8f1a535 --- /dev/null +++ b/plans/pipenv.fmf @@ -0,0 +1,7 @@ +summary: Run pipenv tests +discover: + how: fmf + url: https://src.fedoraproject.org/rpms/pipenv/ +execute: + how: tmt + From b4451f5f06021c3588a686aed0bda77d2f04f51c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 05:35:29 +0000 Subject: [PATCH 47/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 4fa2463..dc4b581 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,6 +1,6 @@ Name: python-chardet Version: 4.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/chardet/chardet @@ -64,6 +64,9 @@ grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jun 02 2021 Python Maint - 4.0.0-3 - Rebuilt for Python 3.10 From 3d6912012410f40f0278709b7a3ec2e837bdda9d Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Tue, 3 Aug 2021 10:08:30 +0200 Subject: [PATCH 48/93] Remove pipenv metadata This package is bundled with pipenv, there is no need to test it with Fedora's version. --- .fmf/version | 1 - plans/pipenv.fmf | 7 ------- 2 files changed, 8 deletions(-) delete mode 100644 .fmf/version delete mode 100644 plans/pipenv.fmf diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/plans/pipenv.fmf b/plans/pipenv.fmf deleted file mode 100644 index 8f1a535..0000000 --- a/plans/pipenv.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run pipenv tests -discover: - how: fmf - url: https://src.fedoraproject.org/rpms/pipenv/ -execute: - how: tmt - From 6955ef0ec4395f51fbbddd6385a3754d6563970f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 11:05:32 +0000 Subject: [PATCH 49/93] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- python-chardet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index dc4b581..9add7da 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,6 +1,6 @@ Name: python-chardet Version: 4.0.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/chardet/chardet @@ -64,6 +64,9 @@ grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 4.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 4.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From c74715dc2b5fa3dd3f5abe6546bf0c2163b659ff Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 14:58:50 +0200 Subject: [PATCH 50/93] Bootstrap for Python 3.11 --- python-chardet.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 9add7da..152dddf 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,6 +1,7 @@ +%global _without_tests 1 Name: python-chardet Version: 4.0.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/chardet/chardet @@ -64,6 +65,9 @@ grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" %changelog +* Mon Jun 13 2022 Python Maint - 4.0.0-6 +- Bootstrap for Python 3.11 + * Fri Jan 21 2022 Fedora Release Engineering - 4.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From b660867530ec7fc7ab5fb71e2ff241d8accce8bc Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 17:09:17 +0200 Subject: [PATCH 51/93] Rebuilt for Python 3.11 --- python-chardet.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index 152dddf..76976eb 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,7 +1,6 @@ -%global _without_tests 1 Name: python-chardet Version: 4.0.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/chardet/chardet @@ -65,6 +64,9 @@ grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" %changelog +* Mon Jun 13 2022 Python Maint - 4.0.0-7 +- Rebuilt for Python 3.11 + * Mon Jun 13 2022 Python Maint - 4.0.0-6 - Bootstrap for Python 3.11 From f6552e77b09ddf648c456ee305609c398566a89a Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 25 Jun 2022 09:07:01 -0400 Subject: [PATCH 52/93] Opt in to rpmautospec --- changelog | 143 +++++++++++++++++++++++++++++++++++++++++++ python-chardet.spec | 146 +------------------------------------------- 2 files changed, 145 insertions(+), 144 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..b7f7ac3 --- /dev/null +++ b/changelog @@ -0,0 +1,143 @@ +* Mon Jun 13 2022 Python Maint - 4.0.0-7 +- Rebuilt for Python 3.11 + +* Mon Jun 13 2022 Python Maint - 4.0.0-6 +- Bootstrap for Python 3.11 + +* Fri Jan 21 2022 Fedora Release Engineering - 4.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 4.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jun 02 2021 Python Maint - 4.0.0-3 +- Rebuilt for Python 3.10 + +* Wed Jun 02 2021 Python Maint - 4.0.0-2 +- Bootstrap for Python 3.10 + +* Fri Feb 05 2021 Miro Hrončok - 4.0.0-1 +- Update to 4.0.0 +- Fixes: rhbz#1906585 +- Fixes: rhbz#1923076 + +* Wed Jan 27 2021 Fedora Release Engineering - 3.0.4-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3.0.4-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri May 22 2020 Miro Hrončok - 3.0.4-17 +- Rebuilt for Python 3.9 + +* Fri May 22 2020 Miro Hrončok - 3.0.4-16 +- Bootstrap for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 3.0.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Nov 14 2019 Miro Hrončok - 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 - 3.0.4-13 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Thu Aug 15 2019 Miro Hrončok - 3.0.4-12 +- Rebuilt for Python 3.8 + +* Wed Aug 14 2019 Miro Hrončok - 3.0.4-11 +- Bootstrap for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 3.0.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 3.0.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Aug 17 2018 Miro Hrončok - 3.0.4-8 +- Only have one /usr/bin/chardetect + +* Fri Jul 13 2018 Fedora Release Engineering - 3.0.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Jun 13 2018 Miro Hrončok - 3.0.4-6 +- Rebuilt for Python 3.7 + +* Sun Feb 11 2018 Iryna Shcherbina - 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 - 3.0.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 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 - 3.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Jun 20 2017 Jeremy Cline - 3.0.4-1 +- Update to 3.0.4 (#1441436) + +* Sat Feb 11 2017 Fedora Release Engineering - 2.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Dec 09 2016 Charalampos Stratakis - 2.3.0-2 +- Rebuild for Python 3.6 + +* Wed Jul 27 2016 Miro Hrončok - 2.3.0-1 +- Update to 2.3.0 (#1150536) + +* Tue Jul 19 2016 Fedora Release Engineering - 2.2.1-6 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Thu Feb 04 2016 Fedora Release Engineering - 2.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Oct 14 2015 Robert Kuska - 2.2.1-4 +- Rebuilt for Python3.5 rebuild + +* Thu Jun 18 2015 Fedora Release Engineering - 2.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Jul 31 2014 Tom Callaway - 2.2.1-2 +- fix license handling + +* Wed Jul 02 2014 Miro Hrončok - 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 - 2.0.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 2.0.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 2.0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sat Jul 21 2012 Fedora Release Engineering - 2.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 2.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 2.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jul 21 2010 David Malcolm - 2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Wed Jan 13 2010 Kushal Das 2.0.1-1 +- New release + +* Sun Jul 26 2009 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Aug 04 2008 Kushal Das 1.0.1-1 +- Initial release + diff --git a/python-chardet.spec b/python-chardet.spec index 76976eb..97e379c 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,6 +1,6 @@ Name: python-chardet Version: 4.0.0 -Release: 7%{?dist} +Release: %autorelease Summary: Character encoding auto-detection in Python License: LGPLv2 URL: https://github.com/chardet/chardet @@ -64,146 +64,4 @@ grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" %changelog -* Mon Jun 13 2022 Python Maint - 4.0.0-7 -- Rebuilt for Python 3.11 - -* Mon Jun 13 2022 Python Maint - 4.0.0-6 -- Bootstrap for Python 3.11 - -* Fri Jan 21 2022 Fedora Release Engineering - 4.0.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 4.0.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jun 02 2021 Python Maint - 4.0.0-3 -- Rebuilt for Python 3.10 - -* Wed Jun 02 2021 Python Maint - 4.0.0-2 -- Bootstrap for Python 3.10 - -* Fri Feb 05 2021 Miro Hrončok - 4.0.0-1 -- Update to 4.0.0 -- Fixes: rhbz#1906585 -- Fixes: rhbz#1923076 - -* Wed Jan 27 2021 Fedora Release Engineering - 3.0.4-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 3.0.4-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri May 22 2020 Miro Hrončok - 3.0.4-17 -- Rebuilt for Python 3.9 - -* Fri May 22 2020 Miro Hrončok - 3.0.4-16 -- Bootstrap for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 3.0.4-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Nov 14 2019 Miro Hrončok - 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 - 3.0.4-13 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Thu Aug 15 2019 Miro Hrončok - 3.0.4-12 -- Rebuilt for Python 3.8 - -* Wed Aug 14 2019 Miro Hrončok - 3.0.4-11 -- Bootstrap for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 3.0.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 3.0.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Aug 17 2018 Miro Hrončok - 3.0.4-8 -- Only have one /usr/bin/chardetect - -* Fri Jul 13 2018 Fedora Release Engineering - 3.0.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jun 13 2018 Miro Hrončok - 3.0.4-6 -- Rebuilt for Python 3.7 - -* Sun Feb 11 2018 Iryna Shcherbina - 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 - 3.0.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 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 - 3.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Jun 20 2017 Jeremy Cline - 3.0.4-1 -- Update to 3.0.4 (#1441436) - -* Sat Feb 11 2017 Fedora Release Engineering - 2.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Dec 09 2016 Charalampos Stratakis - 2.3.0-2 -- Rebuild for Python 3.6 - -* Wed Jul 27 2016 Miro Hrončok - 2.3.0-1 -- Update to 2.3.0 (#1150536) - -* Tue Jul 19 2016 Fedora Release Engineering - 2.2.1-6 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Thu Feb 04 2016 Fedora Release Engineering - 2.2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Oct 14 2015 Robert Kuska - 2.2.1-4 -- Rebuilt for Python3.5 rebuild - -* Thu Jun 18 2015 Fedora Release Engineering - 2.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Jul 31 2014 Tom Callaway - 2.2.1-2 -- fix license handling - -* Wed Jul 02 2014 Miro Hrončok - 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 - 2.0.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 2.0.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 2.0.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 2.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 2.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 2.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jul 21 2010 David Malcolm - 2.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Wed Jan 13 2010 Kushal Das 2.0.1-1 -- New release - -* Sun Jul 26 2009 Fedora Release Engineering - 1.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Aug 04 2008 Kushal Das 1.0.1-1 -- Initial release - +%autochangelog From fd71cc46459e9cefe139e2bc937f8b9be665892c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 25 Jun 2022 10:01:11 -0400 Subject: [PATCH 53/93] Correct License from LGPLv2 to LGPLv2+ --- python-chardet.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 97e379c..68b209e 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,17 @@ Name: python-chardet Version: 4.0.0 Release: %autorelease Summary: Character encoding auto-detection in Python -License: LGPLv2 + +# The entire source is LGPLv2+, except: +# +# - tests/ascii/howto.diveintomark.org.xml is CC-BY-SA (but is not installed) +# +# See also: +# clarify Trove license classifier +# https://github.com/chardet/chardet/issues/162 +# Clarify LGPL version in License trove classifier +# https://github.com/chardet/chardet/pull/255 +License: LGPLv2+ URL: https://github.com/chardet/chardet Source0: %{pypi_source chardet} From f47b6c630923716ed1d15c133d3aa3256c6e1ba1 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 25 Jun 2022 10:08:20 -0400 Subject: [PATCH 54/93] Add a man page for the chardetect command --- chardetect.1 | 23 +++++++++++++++++++++++ python-chardet.spec | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 chardetect.1 diff --git a/chardetect.1 b/chardetect.1 new file mode 100644 index 0000000..31717c2 --- /dev/null +++ b/chardetect.1 @@ -0,0 +1,23 @@ +.TH CHARDETECT "1" "June 2022" "" "User Commands" +.SH NAME +.B chardetect +\(en takes one or more file paths and reports their detected encodings +.SH SYNOPSIS +.B chardetect +.RB [ \-h ] +.RB [ \-\-version ] +.RI [ input \ ...] +.SH OPTIONS +.SS "POSITIONAL ARGUMENTS" +.TP +.I input +File whose encoding we would like to determine. +(default: +.IR stdin ) +.SS "OPTIONAL ARGUMENTS" +.TP +.B \-h\fR, \fB\-\-help +show a help message and exit +.TP +.B \-\-version +show program\(cqs version number and exit diff --git a/python-chardet.spec b/python-chardet.spec index 68b209e..248cc39 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -15,6 +15,8 @@ Summary: Character encoding auto-detection in Python License: LGPLv2+ URL: https://github.com/chardet/chardet Source0: %{pypi_source chardet} +# Hand-written for Fedora in groff_man(7) format based on --help output +Source1: chardetect.1 BuildArch: noarch @@ -59,6 +61,7 @@ grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" %install %pyproject_install %pyproject_save_files chardet +install -t '%{buildroot}%{_mandir}/man1' -D -p -m 0644 '%{SOURCE1}' %if %{with tests} @@ -71,6 +74,7 @@ grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" %license LICENSE %doc README.rst %{_bindir}/chardetect +%{_mandir}/man1/chardetect.1* %changelog From 4c620ca71a681047aa4e1c44ee87bd6d3814b611 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 25 Jun 2022 10:19:04 -0400 Subject: [PATCH 55/93] Update summary and description from upstream --- python-chardet.spec | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index 248cc39..9db58cf 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,7 +1,7 @@ Name: python-chardet Version: 4.0.0 Release: %autorelease -Summary: Character encoding auto-detection in Python +Summary: Python character encoding detector # The entire source is LGPLv2+, except: # @@ -29,17 +29,35 @@ BuildRequires: pyproject-rpm-macros BuildRequires: python3-pytest %endif -%global _description\ -Character encoding auto-detection in Python. As\ -smart as your browser. Open source. +%global common_description %{expand: +Chardet: The Universal Character Encoding Detector -%description %_description +Detects: + + • ASCII, UTF-8, UTF-16 (2 variants), UTF-32 (4 variants) + • Big5, GB2312, EUC-TW, HZ-GB-2312, ISO-2022-CN (Traditional and Simplified + Chinese) + • EUC-JP, SHIFT_JIS, CP932, ISO-2022-JP (Japanese) + • EUC-KR, ISO-2022-KR, Johab (Korean) + • KOI8-R, MacCyrillic, IBM855, IBM866, ISO-8859-5, windows-1251 (Cyrillic) + • ISO-8859-5, windows-1251 (Bulgarian) + • ISO-8859-1, windows-1252 (Western European languages) + • ISO-8859-7, windows-1253 (Greek) + • ISO-8859-8, windows-1255 (Visual and Logical Hebrew) + • TIS-620 (Thai) + +ISO-8859-2 and windows-1250 (Hungarian) probers have been temporarily +disabled.} + +%description +%{common_description} %package -n python3-chardet Summary: %{summary} -%description -n python3-chardet %_description +%description -n python3-chardet +%{common_description} %prep From e537507a1b5624e6c794bae49d6c3f4ee0e3b408 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 25 Jun 2022 10:20:01 -0400 Subject: [PATCH 56/93] Drop explicit pyproject-rpm-macros BR --- python-chardet.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index 9db58cf..b584975 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -21,7 +21,6 @@ Source1: chardetect.1 BuildArch: noarch BuildRequires: python3-devel -BuildRequires: pyproject-rpm-macros # Circular dependency on pytest %bcond_without tests @@ -69,7 +68,7 @@ grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" %generate_buildrequires -%pyproject_buildrequires -r +%pyproject_buildrequires %build From 404157ecdc62f867b5e76bfa77d74622dc313235 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 25 Jun 2022 10:31:42 -0400 Subject: [PATCH 57/93] Package Sphinx-generated PDF in a -doc subpackage --- python-chardet.spec | 46 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index b584975..4954a5b 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,3 +1,12 @@ +# Circular dependency on pytest +%bcond_without tests + +# Sphinx-generated HTML documentation is not suitable for packaging; see +# https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion. +# +# We can generate PDF documentation as a substitute. +%bcond_without doc_pdf + Name: python-chardet Version: 4.0.0 Release: %autorelease @@ -22,12 +31,20 @@ BuildArch: noarch BuildRequires: python3-devel -# Circular dependency on pytest -%bcond_without tests %if %{with tests} BuildRequires: python3-pytest %endif +%if %{with doc_pdf} +BuildRequires: make +BuildRequires: python3dist(sphinx) +BuildRequires: python3dist(sphinx-rtd-theme) +BuildRequires: python3-sphinx-latex +BuildRequires: latexmk +BuildRequires: tex-xetex-bin +BuildRequires: /usr/bin/xindy +%endif + %global common_description %{expand: Chardet: The Universal Character Encoding Detector @@ -59,6 +76,13 @@ Summary: %{summary} %{common_description} +%package doc +Summary: Documentation for python-chardet + +%description doc +%{common_description} + + %prep %autosetup -p1 -n chardet-%{version} @@ -66,6 +90,9 @@ Summary: %{summary} # https://github.com/chardet/chardet/commit/1e94b33329 grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" +# Since pdflatex cannot handle Unicode inputs in general: +echo "latex_engine = 'xelatex'" >> docs/conf.py + %generate_buildrequires %pyproject_buildrequires @@ -74,6 +101,11 @@ grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" %build %pyproject_wheel +%if %{with doc_pdf} +PYTHONPATH="${PWD}" %make_build -C docs latex SPHINXOPTS='%{?_smp_mflags}' +%make_build -C docs/_build/latex LATEXMKOPTS='-quiet' +%endif + %install %pyproject_install @@ -88,11 +120,17 @@ install -t '%{buildroot}%{_mandir}/man1' -D -p -m 0644 '%{SOURCE1}' %files -n python3-chardet -f %{pyproject_files} -%license LICENSE -%doc README.rst %{_bindir}/chardetect %{_mandir}/man1/chardetect.1* +%files doc +%license LICENSE +%doc README.rst +%if %{with doc_pdf} +%doc docs/_build/latex/chardet.pdf +%endif + + %changelog %autochangelog From 47140811aaa2162c9c9f4f46dba6b08d9cc21b25 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 25 Jun 2022 10:56:55 -0400 Subject: [PATCH 58/93] BR python3dist(hypothesis) to enable more tests --- python-chardet.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 4954a5b..56dc09d 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -32,7 +32,9 @@ BuildArch: noarch BuildRequires: python3-devel %if %{with tests} -BuildRequires: python3-pytest +BuildRequires: python3dist(pytest) +# Optional; enables additional tests (see test.py) +BuildRequires: python3dist(hypothesis) %endif %if %{with doc_pdf} From 5ac8e73c24537b0a311137438f2cffc4e2696039 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 25 Jun 2022 12:53:26 -0400 Subject: [PATCH 59/93] Drop test data with problematic license status --- .gitignore | 1 + get_source | 34 ++++++++++++++++++++++++++++++++++ python-chardet.spec | 44 ++++++++++++++++++++++---------------------- sources | 2 +- 4 files changed, 58 insertions(+), 23 deletions(-) create mode 100755 get_source diff --git a/.gitignore b/.gitignore index bb18b7a..4a4974b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /chardet-*.tar.gz /chardet-*/ +/chardet-4.0.0-filtered.tar.xz diff --git a/get_source b/get_source new file mode 100755 index 0000000..8268d9e --- /dev/null +++ b/get_source @@ -0,0 +1,34 @@ +#!/bin/sh +set -o errexit +set -o nounset + +if [ "$#" != '1' ] +then + cat 1>&2 < Downloading: ${URL}" 1>&2 +curl -L -O "${URL}" + +ARCHIVE="$(find . -mindepth 1 -maxdepth 1 -type f -name '*.tar.gz' -print -quit)" +echo "--> Extracting: $(basename "${ARCHIVE}")" 1>&2 +tar -xzf "${ARCHIVE}" +echo '--> Removing tests due to licensing issues' 1>&2 +rm -rvf */tests/ +FILTERED="$(basename "${ARCHIVE}" .tar.gz)-filtered.tar.xz" +echo "--> Re-archiving: ${FILTERED}" 1>&2 +tar -c "${FILTERED}" */ | xz -9e > "${FILTERED}" +mv -v "${FILTERED}.xz" "${OUTDIR}" +echo 'Done.' 1>&2 diff --git a/python-chardet.spec b/python-chardet.spec index 56dc09d..2e38257 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,6 +1,3 @@ -# Circular dependency on pytest -%bcond_without tests - # Sphinx-generated HTML documentation is not suitable for packaging; see # https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion. # @@ -12,31 +9,34 @@ Version: 4.0.0 Release: %autorelease Summary: Python character encoding detector -# The entire source is LGPLv2+, except: -# -# - tests/ascii/howto.diveintomark.org.xml is CC-BY-SA (but is not installed) +# The entire source, after tests/ are filtered, is LGPLv2+. See the comment +# above Source0 for more details on tests/. # # See also: -# clarify Trove license classifier -# https://github.com/chardet/chardet/issues/162 -# Clarify LGPL version in License trove classifier -# https://github.com/chardet/chardet/pull/255 +# clarify Trove license classifier +# https://github.com/chardet/chardet/issues/162 +# Clarify LGPL version in License trove classifier +# https://github.com/chardet/chardet/pull/255 License: LGPLv2+ URL: https://github.com/chardet/chardet -Source0: %{pypi_source chardet} +# A filtered source tarball, obtained by (see Source1): +# +# ./get_source %%{version} +# +# is required because the contents of tests/ are under various undocumented +# licenses and are, for the most part, not freely redistributable. See: +# +# problematic licensing of /tests? +# https://github.com/chardet/chardet/issues/231 +Source0: chardet-%{version}-filtered.tar.xz +Source1: get_source # Hand-written for Fedora in groff_man(7) format based on --help output -Source1: chardetect.1 +Source2: chardetect.1 BuildArch: noarch BuildRequires: python3-devel -%if %{with tests} -BuildRequires: python3dist(pytest) -# Optional; enables additional tests (see test.py) -BuildRequires: python3dist(hypothesis) -%endif - %if %{with doc_pdf} BuildRequires: make BuildRequires: python3dist(sphinx) @@ -112,13 +112,13 @@ PYTHONPATH="${PWD}" %make_build -C docs latex SPHINXOPTS='%{?_smp_mflags}' %install %pyproject_install %pyproject_save_files chardet -install -t '%{buildroot}%{_mandir}/man1' -D -p -m 0644 '%{SOURCE1}' +install -t '%{buildroot}%{_mandir}/man1' -D -p -m 0644 '%{SOURCE2}' -%if %{with tests} %check -%pytest -v -%endif +# We cannot run the upstream tests because they would require data files with +# problematic license status. +%pyproject_check_import %files -n python3-chardet -f %{pyproject_files} diff --git a/sources b/sources index dad62a1..f73c80e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chardet-4.0.0.tar.gz) = ebd7f420e1094445270db993f6373ffe7370419e002b0bb13299dc6c9b0f7c4e77b0f44f871fba6371e6869e7c86728514367db377e3137487a3acf50cb81e96 +SHA512 (chardet-4.0.0-filtered.tar.xz) = ac510d460dc65233bda8d11964d6d9a130a53ef64035393d05c52ab6c4e0b7a7ca6f34108c21771fb40236d71e7de62dfe6c6f9fa6cd1722a355116930b5e12b From 54e08a90f362abcc795c885b69f65dcc2893ac2d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 25 Jun 2022 12:59:37 -0400 Subject: [PATCH 60/93] Fix get_source_script --- get_source | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/get_source b/get_source index 8268d9e..513d1d3 100755 --- a/get_source +++ b/get_source @@ -30,5 +30,5 @@ rm -rvf */tests/ FILTERED="$(basename "${ARCHIVE}" .tar.gz)-filtered.tar.xz" echo "--> Re-archiving: ${FILTERED}" 1>&2 tar -c "${FILTERED}" */ | xz -9e > "${FILTERED}" -mv -v "${FILTERED}.xz" "${OUTDIR}" +mv -v "${FILTERED}" "${OUTDIR}" echo 'Done.' 1>&2 diff --git a/sources b/sources index f73c80e..dc7d2f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chardet-4.0.0-filtered.tar.xz) = ac510d460dc65233bda8d11964d6d9a130a53ef64035393d05c52ab6c4e0b7a7ca6f34108c21771fb40236d71e7de62dfe6c6f9fa6cd1722a355116930b5e12b +SHA512 (chardet-4.0.0-filtered.tar.xz) = 4c41d5f9311e6796a3270b5ecd63abc51e52962c97a7599e8756e82ba97998306e2e841e14da96441a63c446fa9142534bac7154579822b55882e621f3bbe2e0 From 4e6f7533835eaf18cd0af984fc5a941f4d5941e9 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 25 Jun 2022 13:01:53 -0400 Subject: [PATCH 61/93] Update to 5.0.0 (close RHBZ#2101067) --- .gitignore | 1 + python-chardet.spec | 8 ++------ sources | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 4a4974b..5351a30 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /chardet-*.tar.gz /chardet-*/ /chardet-4.0.0-filtered.tar.xz +/chardet-5.0.0-filtered.tar.xz diff --git a/python-chardet.spec b/python-chardet.spec index 2e38257..225ad1f 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -5,7 +5,7 @@ %bcond_without doc_pdf Name: python-chardet -Version: 4.0.0 +Version: 5.0.0 Release: %autorelease Summary: Python character encoding detector @@ -86,11 +86,7 @@ Summary: Documentation for python-chardet %prep -%autosetup -p1 -n chardet-%{version} - -# Remove useless shebangs -# https://github.com/chardet/chardet/commit/1e94b33329 -grep -lr "^#\!/usr/bin/env python" chardet/ | xargs sed -i "1d" +%autosetup -n chardet-%{version} # Since pdflatex cannot handle Unicode inputs in general: echo "latex_engine = 'xelatex'" >> docs/conf.py diff --git a/sources b/sources index dc7d2f5..0e05f69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chardet-4.0.0-filtered.tar.xz) = 4c41d5f9311e6796a3270b5ecd63abc51e52962c97a7599e8756e82ba97998306e2e841e14da96441a63c446fa9142534bac7154579822b55882e621f3bbe2e0 +SHA512 (chardet-5.0.0-filtered.tar.xz) = 6673691b81d94cf39daaf2d9fb9e98c0aa56e531b4d191206c4988da77a190663d37d387cf4b66aa49d3e38ff8a22cc1915a23adb86c21e80144a48fa0a55791 From 7c2ef5edec7e47e2bb333001edf05bd8e28de254 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 17:15:48 +0000 Subject: [PATCH 62/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 8d4593d9d94abf5226d0bf7fb707e730402306b5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 21 Oct 2022 09:17:56 -0400 Subject: [PATCH 63/93] Update License to SPDX --- python-chardet.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index 225ad1f..11e6251 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -9,15 +9,15 @@ Version: 5.0.0 Release: %autorelease Summary: Python character encoding detector -# The entire source, after tests/ are filtered, is LGPLv2+. See the comment -# above Source0 for more details on tests/. +# The entire source, after tests/ are filtered, is LGPL-2.0-or-later. See the +# comment above Source0 for more details on tests/. # # See also: # clarify Trove license classifier # https://github.com/chardet/chardet/issues/162 # Clarify LGPL version in License trove classifier # https://github.com/chardet/chardet/pull/255 -License: LGPLv2+ +License: LGPL-2.0-or-later URL: https://github.com/chardet/chardet # A filtered source tarball, obtained by (see Source1): # From 504995a382756504b0b7bc8344556d1072477634 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 1 Dec 2022 18:01:02 -0500 Subject: [PATCH 64/93] Update to 5.1.0 (close RHBZ#2150154) --- .gitignore | 1 + chardetect.1 | 6 ++++++ python-chardet.spec | 8 +------- sources | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 5351a30..a4332f7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /chardet-*/ /chardet-4.0.0-filtered.tar.xz /chardet-5.0.0-filtered.tar.xz +/chardet-5.1.0-filtered.tar.xz diff --git a/chardetect.1 b/chardetect.1 index 31717c2..f6f0ff2 100644 --- a/chardetect.1 +++ b/chardetect.1 @@ -19,5 +19,11 @@ File whose encoding we would like to determine. .B \-h\fR, \fB\-\-help show a help message and exit .TP +.B \-\-minimal +Print only the encoding to standard output +.TP +.B \-l\fR, \fB\-\-legacy +Rename legacy encodings to more modern ones. +.TP .B \-\-version show program\(cqs version number and exit diff --git a/python-chardet.spec b/python-chardet.spec index 11e6251..a84cad8 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -5,18 +5,12 @@ %bcond_without doc_pdf Name: python-chardet -Version: 5.0.0 +Version: 5.1.0 Release: %autorelease Summary: Python character encoding detector # The entire source, after tests/ are filtered, is LGPL-2.0-or-later. See the # comment above Source0 for more details on tests/. -# -# See also: -# clarify Trove license classifier -# https://github.com/chardet/chardet/issues/162 -# Clarify LGPL version in License trove classifier -# https://github.com/chardet/chardet/pull/255 License: LGPL-2.0-or-later URL: https://github.com/chardet/chardet # A filtered source tarball, obtained by (see Source1): diff --git a/sources b/sources index 0e05f69..75041bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chardet-5.0.0-filtered.tar.xz) = 6673691b81d94cf39daaf2d9fb9e98c0aa56e531b4d191206c4988da77a190663d37d387cf4b66aa49d3e38ff8a22cc1915a23adb86c21e80144a48fa0a55791 +SHA512 (chardet-5.1.0-filtered.tar.xz) = 7682933114ae0a13534af95d2afdf297cd5f6003f9d6430fbcf63c080c175e7859de62efcf990f392f590da93b0a7979bdf00134b52f6d45198b253a030056f0 From 1bae21d579f4d3b08febe9a089eb91ca185a6974 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 12:03:12 +0000 Subject: [PATCH 65/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 70b1e7fa6941128d8e32f3791c063c9335920b28 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 17 Mar 2023 09:55:48 -0400 Subject: [PATCH 66/93] =?UTF-8?q?Don=E2=80=99t=20assume=20%=5Fsmp=5Fmflags?= =?UTF-8?q?=20is=20-j%=5Fsmp=5Fbuild=5Fncpus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- python-chardet.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index a84cad8..cdddd3e 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -94,7 +94,8 @@ echo "latex_engine = 'xelatex'" >> docs/conf.py %pyproject_wheel %if %{with doc_pdf} -PYTHONPATH="${PWD}" %make_build -C docs latex SPHINXOPTS='%{?_smp_mflags}' +PYTHONPATH="${PWD}" %make_build -C docs latex \ + SPHINXOPTS='-j%{?_smp_build_ncpus}' %make_build -C docs/_build/latex LATEXMKOPTS='-quiet' %endif From 1159f9bf7b1e054cfb9ee322b97b4d8309a6d2f1 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:33:25 +0200 Subject: [PATCH 67/93] Bootstrap for Python 3.12 --- python-chardet.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-chardet.spec b/python-chardet.spec index cdddd3e..65db93c 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,3 +1,4 @@ +%global _without_doc_pdf 1 # Sphinx-generated HTML documentation is not suitable for packaging; see # https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion. # From ced676c2d75f050e8b75272901a5c584ebc4e7dd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 16 Jun 2023 08:18:02 +0200 Subject: [PATCH 68/93] Rebuilt for Python 3.12 --- python-chardet.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 65db93c..cdddd3e 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,4 +1,3 @@ -%global _without_doc_pdf 1 # Sphinx-generated HTML documentation is not suitable for packaging; see # https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion. # From 94b3a06b764c371155ab9fd8fcbaf5c3611ce6fa Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 6 Jul 2023 21:05:56 -0400 Subject: [PATCH 69/93] Use new (rpm 4.17.1+) bcond style --- python-chardet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index cdddd3e..7746f6e 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion. # # We can generate PDF documentation as a substitute. -%bcond_without doc_pdf +%bcond doc_pdf 1 Name: python-chardet Version: 5.1.0 From 188cee849d5401a8e5bc871536ab9bf90de45502 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 11 Jul 2023 08:13:08 -0400 Subject: [PATCH 70/93] When PDF docs are disabled, omit the -doc subpackage --- python-chardet.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index 7746f6e..dc600a0 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,7 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion. # # We can generate PDF documentation as a substitute. -%bcond doc_pdf 1 +%bcond doc 1 Name: python-chardet Version: 5.1.0 @@ -31,7 +31,7 @@ BuildArch: noarch BuildRequires: python3-devel -%if %{with doc_pdf} +%if %{with doc} BuildRequires: make BuildRequires: python3dist(sphinx) BuildRequires: python3dist(sphinx-rtd-theme) @@ -93,7 +93,7 @@ echo "latex_engine = 'xelatex'" >> docs/conf.py %build %pyproject_wheel -%if %{with doc_pdf} +%if %{with doc} PYTHONPATH="${PWD}" %make_build -C docs latex \ SPHINXOPTS='-j%{?_smp_build_ncpus}' %make_build -C docs/_build/latex LATEXMKOPTS='-quiet' @@ -113,14 +113,17 @@ install -t '%{buildroot}%{_mandir}/man1' -D -p -m 0644 '%{SOURCE2}' %files -n python3-chardet -f %{pyproject_files} +%if %{without doc} +%doc README.rst +%endif %{_bindir}/chardetect %{_mandir}/man1/chardetect.1* +%if %{with doc} %files doc %license LICENSE %doc README.rst -%if %{with doc_pdf} %doc docs/_build/latex/chardet.pdf %endif From 07aea33b1513c18eb9ada09273121dea69c1be38 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 08:19:39 +0000 Subject: [PATCH 71/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 01a67c2e9d3400bb28a4e928569b3546e2df2e18 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 1 Aug 2023 21:01:12 -0400 Subject: [PATCH 72/93] Update to 5.2.0 (close RHBZ#2228250) --- .gitignore | 1 + python-chardet.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a4332f7..9a81b57 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /chardet-4.0.0-filtered.tar.xz /chardet-5.0.0-filtered.tar.xz /chardet-5.1.0-filtered.tar.xz +/chardet-5.2.0-filtered.tar.xz diff --git a/python-chardet.spec b/python-chardet.spec index dc600a0..dc60893 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -5,7 +5,7 @@ %bcond doc 1 Name: python-chardet -Version: 5.1.0 +Version: 5.2.0 Release: %autorelease Summary: Python character encoding detector diff --git a/sources b/sources index 75041bb..44e7115 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chardet-5.1.0-filtered.tar.xz) = 7682933114ae0a13534af95d2afdf297cd5f6003f9d6430fbcf63c080c175e7859de62efcf990f392f590da93b0a7979bdf00134b52f6d45198b253a030056f0 +SHA512 (chardet-5.2.0-filtered.tar.xz) = 4f865b958503596cdaf690d0cb586c7c477419ca528b4701d93577c34764fcbab2246d79b82fe25a06246c59cedb9344ec332540efb76cc02d49158fb4903974 From b11aa7eefcd4ee86d55134877aded2efeb241fa8 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 17 Dec 2023 13:40:37 -0500 Subject: [PATCH 73/93] Assert that %pyproject_files contains a license file --- python-chardet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index dc60893..268d02f 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -102,7 +102,7 @@ PYTHONPATH="${PWD}" %make_build -C docs latex \ %install %pyproject_install -%pyproject_save_files chardet +%pyproject_save_files -l chardet install -t '%{buildroot}%{_mandir}/man1' -D -p -m 0644 '%{SOURCE2}' From e1a31906fdcb40ad8885993203cbb162c443108c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 00:05:33 +0000 Subject: [PATCH 74/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c079aef0ca518649256471ba14610d4db084fc15 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 02:21:39 +0000 Subject: [PATCH 75/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From efdc312e8f0a607485e68c8c46df1b029636976c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 28 Mar 2024 20:10:05 -0400 Subject: [PATCH 76/93] Add an rpmlintrc file [skip changelog] --- python-chardet.rpmlintrc | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 python-chardet.rpmlintrc diff --git a/python-chardet.rpmlintrc b/python-chardet.rpmlintrc new file mode 100644 index 0000000..54743c7 --- /dev/null +++ b/python-chardet.rpmlintrc @@ -0,0 +1,6 @@ +# Not a real spelling error: +addFilter(r" spelling-error \('([Pp]rober)s?',") +# This Source cannot be a URL because we must filter out certain files. +addFilter(r" invalid-url Source[0-9]+: chardet-.*-filtered\.tar\.xz") +# This is a maintainer script; it should be executable +addFilter(r" strange-permission get_source 775") From 63ae951a91b178adf00c7dbfbc4fc6ded4c89a6c Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 4 Apr 2024 22:47:42 -0400 Subject: [PATCH 77/93] Update rpmlintrc file [skip changelog] --- python-chardet.rpmlintrc | 2 -- 1 file changed, 2 deletions(-) diff --git a/python-chardet.rpmlintrc b/python-chardet.rpmlintrc index 54743c7..9abf571 100644 --- a/python-chardet.rpmlintrc +++ b/python-chardet.rpmlintrc @@ -2,5 +2,3 @@ addFilter(r" spelling-error \('([Pp]rober)s?',") # This Source cannot be a URL because we must filter out certain files. addFilter(r" invalid-url Source[0-9]+: chardet-.*-filtered\.tar\.xz") -# This is a maintainer script; it should be executable -addFilter(r" strange-permission get_source 775") From f5e5a80c16e1d278f037a3233e6564207c4734aa Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 4 Apr 2024 22:38:26 -0400 Subject: [PATCH 78/93] Make the filtered source archive more reproducible --- get_source | 19 +++++++++++++++++-- sources | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/get_source b/get_source index 513d1d3..7b8cede 100755 --- a/get_source +++ b/get_source @@ -25,10 +25,25 @@ curl -L -O "${URL}" ARCHIVE="$(find . -mindepth 1 -maxdepth 1 -type f -name '*.tar.gz' -print -quit)" echo "--> Extracting: $(basename "${ARCHIVE}")" 1>&2 tar -xzf "${ARCHIVE}" +cp -p "${ARCHIVE}" /tmp/ echo '--> Removing tests due to licensing issues' 1>&2 -rm -rvf */tests/ +TARDIR="$(basename "${ARCHIVE}" '.tar.gz')" +MTIME="$(stat -c '%Y' "${TARDIR}")" +rm -rvf "${TARDIR}/tests/" +# Restore the original mtime even though we modified the base directory by +# removing the tests. +touch -d @"${MTIME}" "${TARDIR}" FILTERED="$(basename "${ARCHIVE}" .tar.gz)-filtered.tar.xz" echo "--> Re-archiving: ${FILTERED}" 1>&2 -tar -c "${FILTERED}" */ | xz -9e > "${FILTERED}" +# https://www.gnu.org/software/tar/manual/html_section/Reproducibility.html +TZ=UTC LC_ALL=C tar \ + --create --verbose \ + --sort=name \ + --format=posix \ + --numeric-owner --owner=0 --group=0 \ + --mode=go+u,go-w \ + --pax-option='delete=atime,delete=ctime' \ + "${TARDIR}/" | + xz -9e > "${FILTERED}" mv -v "${FILTERED}" "${OUTDIR}" echo 'Done.' 1>&2 diff --git a/sources b/sources index 44e7115..92192b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chardet-5.2.0-filtered.tar.xz) = 4f865b958503596cdaf690d0cb586c7c477419ca528b4701d93577c34764fcbab2246d79b82fe25a06246c59cedb9344ec332540efb76cc02d49158fb4903974 +SHA512 (chardet-5.2.0-filtered.tar.xz) = 4ed51684c86bab8f4822035d180e375c7f4817e29b172363d1d5183043f0022f2c2245958a4b00064e6dda756c0c1d283bed9c41026c1be93fe87b13940e455c From be25609845bff428cc1ffe2d2ae790d4add86302 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 4 Apr 2024 22:40:44 -0400 Subject: [PATCH 79/93] Use zstd instead of xz for filtered source archive compression This is based on the relative health of the upstream projects. --- .gitignore | 1 + get_source | 2 +- python-chardet.rpmlintrc | 4 +++- python-chardet.spec | 2 +- sources | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9a81b57..39daced 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /chardet-5.0.0-filtered.tar.xz /chardet-5.1.0-filtered.tar.xz /chardet-5.2.0-filtered.tar.xz +/chardet-5.2.0-filtered.tar.zst diff --git a/get_source b/get_source index 7b8cede..6ca292e 100755 --- a/get_source +++ b/get_source @@ -33,7 +33,7 @@ rm -rvf "${TARDIR}/tests/" # Restore the original mtime even though we modified the base directory by # removing the tests. touch -d @"${MTIME}" "${TARDIR}" -FILTERED="$(basename "${ARCHIVE}" .tar.gz)-filtered.tar.xz" +FILTERED="$(basename "${ARCHIVE}" .tar.gz)-filtered.tar.zst" echo "--> Re-archiving: ${FILTERED}" 1>&2 # https://www.gnu.org/software/tar/manual/html_section/Reproducibility.html TZ=UTC LC_ALL=C tar \ diff --git a/python-chardet.rpmlintrc b/python-chardet.rpmlintrc index 9abf571..e12cd89 100644 --- a/python-chardet.rpmlintrc +++ b/python-chardet.rpmlintrc @@ -1,4 +1,6 @@ # Not a real spelling error: addFilter(r" spelling-error \('([Pp]rober)s?',") # This Source cannot be a URL because we must filter out certain files. -addFilter(r" invalid-url Source[0-9]+: chardet-.*-filtered\.tar\.xz") +addFilter(r" invalid-url Source[0-9]+: chardet-.*-filtered\.tar\.zst") +# Bogus; it is a perfectly fine zstandard file. +addFilter(r" inconsistent-file-extension chardet-.*-filtered\.tar\.zst$") diff --git a/python-chardet.spec b/python-chardet.spec index 268d02f..9fb3cab 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -22,7 +22,7 @@ URL: https://github.com/chardet/chardet # # problematic licensing of /tests? # https://github.com/chardet/chardet/issues/231 -Source0: chardet-%{version}-filtered.tar.xz +Source0: chardet-%{version}-filtered.tar.zst Source1: get_source # Hand-written for Fedora in groff_man(7) format based on --help output Source2: chardetect.1 diff --git a/sources b/sources index 92192b4..9250f6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chardet-5.2.0-filtered.tar.xz) = 4ed51684c86bab8f4822035d180e375c7f4817e29b172363d1d5183043f0022f2c2245958a4b00064e6dda756c0c1d283bed9c41026c1be93fe87b13940e455c +SHA512 (chardet-5.2.0-filtered.tar.zst) = 4ed51684c86bab8f4822035d180e375c7f4817e29b172363d1d5183043f0022f2c2245958a4b00064e6dda756c0c1d283bed9c41026c1be93fe87b13940e455c From a2f928beb2cd806d4d00174e7146e4a7eabfeeef Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 08:39:31 +0200 Subject: [PATCH 80/93] Bootstrap for Python 3.13 --- python-chardet.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/python-chardet.spec b/python-chardet.spec index 9fb3cab..c477b7a 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,3 +1,4 @@ +%global _without_doc 1 # Sphinx-generated HTML documentation is not suitable for packaging; see # https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion. # From 09dae8a7bbd6d9fdd6e789a945859327c27cef98 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 20:41:48 +0200 Subject: [PATCH 81/93] Rebuilt for Python 3.13 --- python-chardet.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index c477b7a..9fb3cab 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,4 +1,3 @@ -%global _without_doc 1 # Sphinx-generated HTML documentation is not suitable for packaging; see # https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion. # From b65093a110d59fba636bd267892368a9ee2c0dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Thu, 4 Jul 2024 23:05:16 +0200 Subject: [PATCH 82/93] Disable doc on RHEL There is no /usr/bin/xindy in c9s, epel9, c10s. This package might be needed in future epel10 for tox. [skip changelog] --- python-chardet.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python-chardet.spec b/python-chardet.spec index 9fb3cab..4d6b7e6 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -2,7 +2,8 @@ # https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion. # # We can generate PDF documentation as a substitute. -%bcond doc 1 +# EL 9/10 has no /usr/bin/xindy +%bcond doc %{undefined rhel} Name: python-chardet Version: 5.2.0 From e8ed5df38f6fed6a23271d08af92a8ef50fd9087 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 5 Jul 2024 16:09:14 -0400 Subject: [PATCH 83/93] F41+: Stop building PDF documentation; drop -doc subpackage --- python-chardet.rpmlintrc | 2 ++ python-chardet.spec | 46 +++------------------------------------- 2 files changed, 5 insertions(+), 43 deletions(-) diff --git a/python-chardet.rpmlintrc b/python-chardet.rpmlintrc index e12cd89..d5d9c0f 100644 --- a/python-chardet.rpmlintrc +++ b/python-chardet.rpmlintrc @@ -4,3 +4,5 @@ addFilter(r" spelling-error \('([Pp]rober)s?',") addFilter(r" invalid-url Source[0-9]+: chardet-.*-filtered\.tar\.zst") # Bogus; it is a perfectly fine zstandard file. addFilter(r" inconsistent-file-extension chardet-.*-filtered\.tar\.zst$") +# The -doc subpackage was removed without an equivalent replacement. +addFilter(r" obsolete-not-provided python-chardet-doc$") diff --git a/python-chardet.spec b/python-chardet.spec index 4d6b7e6..32cf21b 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,10 +1,3 @@ -# Sphinx-generated HTML documentation is not suitable for packaging; see -# https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion. -# -# We can generate PDF documentation as a substitute. -# EL 9/10 has no /usr/bin/xindy -%bcond doc %{undefined rhel} - Name: python-chardet Version: 5.2.0 Release: %autorelease @@ -32,16 +25,6 @@ BuildArch: noarch BuildRequires: python3-devel -%if %{with doc} -BuildRequires: make -BuildRequires: python3dist(sphinx) -BuildRequires: python3dist(sphinx-rtd-theme) -BuildRequires: python3-sphinx-latex -BuildRequires: latexmk -BuildRequires: tex-xetex-bin -BuildRequires: /usr/bin/xindy -%endif - %global common_description %{expand: Chardet: The Universal Character Encoding Detector @@ -69,23 +52,16 @@ disabled.} %package -n python3-chardet Summary: %{summary} +# Removed in F41: +Obsoletes: python-chardet-doc < 5.2.0-12 + %description -n python3-chardet %{common_description} -%package doc -Summary: Documentation for python-chardet - -%description doc -%{common_description} - - %prep %autosetup -n chardet-%{version} -# Since pdflatex cannot handle Unicode inputs in general: -echo "latex_engine = 'xelatex'" >> docs/conf.py - %generate_buildrequires %pyproject_buildrequires @@ -94,12 +70,6 @@ echo "latex_engine = 'xelatex'" >> docs/conf.py %build %pyproject_wheel -%if %{with doc} -PYTHONPATH="${PWD}" %make_build -C docs latex \ - SPHINXOPTS='-j%{?_smp_build_ncpus}' -%make_build -C docs/_build/latex LATEXMKOPTS='-quiet' -%endif - %install %pyproject_install @@ -114,20 +84,10 @@ install -t '%{buildroot}%{_mandir}/man1' -D -p -m 0644 '%{SOURCE2}' %files -n python3-chardet -f %{pyproject_files} -%if %{without doc} %doc README.rst -%endif %{_bindir}/chardetect %{_mandir}/man1/chardetect.1* -%if %{with doc} -%files doc -%license LICENSE -%doc README.rst -%doc docs/_build/latex/chardet.pdf -%endif - - %changelog %autochangelog From e544222c2002ff041b64ff7b913a95e9a5028f54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 10:18:16 +0000 Subject: [PATCH 84/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 0216c447b6e201c7a1b79f6e2eac29c042c7789b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 25 Jul 2024 12:45:54 -0400 Subject: [PATCH 85/93] Fix source archive, which was xz-compressed despite the .zst extension --- get_source | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/get_source b/get_source index 6ca292e..d9e18d4 100755 --- a/get_source +++ b/get_source @@ -44,6 +44,6 @@ TZ=UTC LC_ALL=C tar \ --mode=go+u,go-w \ --pax-option='delete=atime,delete=ctime' \ "${TARDIR}/" | - xz -9e > "${FILTERED}" + zstdmt --ultra -22 > "${FILTERED}" mv -v "${FILTERED}" "${OUTDIR}" echo 'Done.' 1>&2 diff --git a/sources b/sources index 9250f6d..3fe621b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chardet-5.2.0-filtered.tar.zst) = 4ed51684c86bab8f4822035d180e375c7f4817e29b172363d1d5183043f0022f2c2245958a4b00064e6dda756c0c1d283bed9c41026c1be93fe87b13940e455c +SHA512 (chardet-5.2.0-filtered.tar.zst) = 410b2d62c54781f9b848ee78c659d4607bbb7f94f6117d7fa7cd5f82a50dfaf10d6e4c6dfaefa9b9a721b846c167aa12eae029debbaa66b0d830875c8ce5749c From de9115b8d059854cbed67ebc8b1bf679eaf8a606 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 6 Aug 2024 17:32:36 -0400 Subject: [PATCH 86/93] Remove a debugging line from the get_source script [skip changelog] --- get_source | 1 - 1 file changed, 1 deletion(-) diff --git a/get_source b/get_source index d9e18d4..a574f7e 100755 --- a/get_source +++ b/get_source @@ -25,7 +25,6 @@ curl -L -O "${URL}" ARCHIVE="$(find . -mindepth 1 -maxdepth 1 -type f -name '*.tar.gz' -print -quit)" echo "--> Extracting: $(basename "${ARCHIVE}")" 1>&2 tar -xzf "${ARCHIVE}" -cp -p "${ARCHIVE}" /tmp/ echo '--> Removing tests due to licensing issues' 1>&2 TARDIR="$(basename "${ARCHIVE}" '.tar.gz')" MTIME="$(stat -c '%Y' "${TARDIR}")" From 353a16c6dc8fefc36416d26b32b63c542d048b43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 12:50:21 +0000 Subject: [PATCH 87/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 09b953d84596fa8aae8af401aaed2c9c12f911cf Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 3 May 2025 08:01:53 -0400 Subject: [PATCH 88/93] Update .rpmlintrc file for current rpmlint --- python-chardet.rpmlintrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python-chardet.rpmlintrc b/python-chardet.rpmlintrc index d5d9c0f..39210e7 100644 --- a/python-chardet.rpmlintrc +++ b/python-chardet.rpmlintrc @@ -6,3 +6,6 @@ addFilter(r" invalid-url Source[0-9]+: chardet-.*-filtered\.tar\.zst") addFilter(r" inconsistent-file-extension chardet-.*-filtered\.tar\.zst$") # The -doc subpackage was removed without an equivalent replacement. addFilter(r" obsolete-not-provided python-chardet-doc$") +# Update LGPLv2.1 license text and notices for remote-only FSF +# https://github.com/chardet/chardet/pull/307 +addFilter(r" incorrect-fsf-address ") From f3975537e1bfc5cb5d3a0a6e55c7bbaacd555631 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 3 May 2025 08:03:22 -0400 Subject: [PATCH 89/93] F41+: Use the provisional pyproject declarative buildsystem --- python-chardet.spec | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/python-chardet.spec b/python-chardet.spec index 32cf21b..a851737 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -21,9 +21,10 @@ Source1: get_source # Hand-written for Fedora in groff_man(7) format based on --help output Source2: chardetect.1 -BuildArch: noarch +BuildSystem: pyproject +BuildOption(install): -l chardet -BuildRequires: python3-devel +BuildArch: noarch %global common_description %{expand: Chardet: The Universal Character Encoding Detector @@ -59,28 +60,12 @@ Obsoletes: python-chardet-doc < 5.2.0-12 %{common_description} -%prep -%autosetup -n chardet-%{version} - - -%generate_buildrequires -%pyproject_buildrequires - - -%build -%pyproject_wheel - - -%install -%pyproject_install -%pyproject_save_files -l chardet +%install -a install -t '%{buildroot}%{_mandir}/man1' -D -p -m 0644 '%{SOURCE2}' -%check # We cannot run the upstream tests because they would require data files with # problematic license status. -%pyproject_check_import %files -n python3-chardet -f %{pyproject_files} From 1b67fcd42bd8008f8c7de99a818b355ae0baa5ac Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:12:11 +0200 Subject: [PATCH 90/93] Rebuilt for Python 3.14 From 74eeca08946304631670ec11c7a98652746b3059 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 07:09:54 +0000 Subject: [PATCH 91/93] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 2683a633718fd1f626e85ec0292f3c66a7a1c3bd Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 13:54:11 +0200 Subject: [PATCH 92/93] Rebuilt for Python 3.14.0rc2 bytecode From 17642dfc179aaf2e3ab07e2c3eb7e5c064de89c3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:58:27 +0200 Subject: [PATCH 93/93] Rebuilt for Python 3.14.0rc3 bytecode