From 70b1e7fa6941128d8e32f3791c063c9335920b28 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Fri, 17 Mar 2023 09:55:48 -0400
Subject: [PATCH 01/28] =?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 <python-maint@redhat.com>
Date: Tue, 13 Jun 2023 20:33:25 +0200
Subject: [PATCH 02/28] 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 <python-maint@redhat.com>
Date: Fri, 16 Jun 2023 08:18:02 +0200
Subject: [PATCH 03/28] 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" <code@musicinmybrain.net>
Date: Thu, 6 Jul 2023 21:05:56 -0400
Subject: [PATCH 04/28] 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" <code@musicinmybrain.net>
Date: Tue, 11 Jul 2023 08:13:08 -0400
Subject: [PATCH 05/28] 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 <releng@fedoraproject.org>
Date: Fri, 21 Jul 2023 08:19:39 +0000
Subject: [PATCH 06/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From 01a67c2e9d3400bb28a4e928569b3546e2df2e18 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 1 Aug 2023 21:01:12 -0400
Subject: [PATCH 07/28] 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" <code@musicinmybrain.net>
Date: Sun, 17 Dec 2023 13:40:37 -0500
Subject: [PATCH 08/28] 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 <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 00:05:33 +0000
Subject: [PATCH 09/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild


From c079aef0ca518649256471ba14610d4db084fc15 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 26 Jan 2024 02:21:39 +0000
Subject: [PATCH 10/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild


From efdc312e8f0a607485e68c8c46df1b029636976c Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 28 Mar 2024 20:10:05 -0400
Subject: [PATCH 11/28] 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" <code@musicinmybrain.net>
Date: Thu, 4 Apr 2024 22:47:42 -0400
Subject: [PATCH 12/28] 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" <code@musicinmybrain.net>
Date: Thu, 4 Apr 2024 22:38:26 -0400
Subject: [PATCH 13/28] 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" <code@musicinmybrain.net>
Date: Thu, 4 Apr 2024 22:40:44 -0400
Subject: [PATCH 14/28] 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 <python-maint@redhat.com>
Date: Fri, 7 Jun 2024 08:39:31 +0200
Subject: [PATCH 15/28] 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 <python-maint@redhat.com>
Date: Fri, 7 Jun 2024 20:41:48 +0200
Subject: [PATCH 16/28] 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?= <miro@hroncok.cz>
Date: Thu, 4 Jul 2024 23:05:16 +0200
Subject: [PATCH 17/28] 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" <code@musicinmybrain.net>
Date: Fri, 5 Jul 2024 16:09:14 -0400
Subject: [PATCH 18/28] 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 <releng@fedoraproject.org>
Date: Fri, 19 Jul 2024 10:18:16 +0000
Subject: [PATCH 19/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild


From 0216c447b6e201c7a1b79f6e2eac29c042c7789b Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Thu, 25 Jul 2024 12:45:54 -0400
Subject: [PATCH 20/28] 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" <code@musicinmybrain.net>
Date: Tue, 6 Aug 2024 17:32:36 -0400
Subject: [PATCH 21/28] 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 <releng@fedoraproject.org>
Date: Sat, 18 Jan 2025 12:50:21 +0000
Subject: [PATCH 22/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild


From 09b953d84596fa8aae8af401aaed2c9c12f911cf Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Sat, 3 May 2025 08:01:53 -0400
Subject: [PATCH 23/28] 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" <code@musicinmybrain.net>
Date: Sat, 3 May 2025 08:03:22 -0400
Subject: [PATCH 24/28] 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 <python-maint@redhat.com>
Date: Mon, 2 Jun 2025 20:12:11 +0200
Subject: [PATCH 25/28] Rebuilt for Python 3.14


From 74eeca08946304631670ec11c7a98652746b3059 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 07:09:54 +0000
Subject: [PATCH 26/28] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild


From 2683a633718fd1f626e85ec0292f3c66a7a1c3bd Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Fri, 15 Aug 2025 13:54:11 +0200
Subject: [PATCH 27/28] Rebuilt for Python 3.14.0rc2 bytecode


From 17642dfc179aaf2e3ab07e2c3eb7e5c064de89c3 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Fri, 19 Sep 2025 12:58:27 +0200
Subject: [PATCH 28/28] Rebuilt for Python 3.14.0rc3 bytecode