From c2592935e14bccc2b03f5c413acca6c0eac566df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Tue, 17 Oct 2023 21:07:50 +0200 Subject: [PATCH] Convert from Fedora for the Python 3.12 stack in RHEL --- README.md | 3 -- changelog | 50 ------------------------------ python3.12-charset-normalizer.spec | 45 ++++++++++++++------------- 3 files changed, 23 insertions(+), 75 deletions(-) delete mode 100644 README.md delete mode 100644 changelog diff --git a/README.md b/README.md deleted file mode 100644 index 5c111b2..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# python-charset-normalizer - -The python-charset-normalizer package diff --git a/changelog b/changelog deleted file mode 100644 index 72ec0cd..0000000 --- a/changelog +++ /dev/null @@ -1,50 +0,0 @@ -* Thu Jan 19 2023 Lumír Balhar - 3.0.1-1 -- Update to 3.0.1 (rhbz#2118769) - -* Fri Jul 22 2022 Fedora Release Engineering - 2.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 20 2022 Lumír Balhar - 2.1.0-1 -- Update to 2.1.0 -Resolves: rhbz#2098481 - -* Mon Jun 13 2022 Python Maint - 2.0.12-2 -- Rebuilt for Python 3.11 - -* Mon Feb 14 2022 Lumír Balhar - 2.0.12-1 -- Update to 2.0.12 -Resolves: rhbz#2053838 - -* Mon Jan 31 2022 Lumír Balhar - 2.0.11-1 -- Update to 2.0.11 -Resolves: rhbz#2048279 - -* Fri Jan 21 2022 Fedora Release Engineering - 2.0.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jan 05 2022 Lumír Balhar - 2.0.10-1 -- Update to 2.0.10 -Resolves: rhbz#2037079 - -* Fri Dec 17 2021 Lumír Balhar - 2.0.9-1 -- Update to 2.0.9 -Resolves: rhbz#2028947 - -* Mon Nov 29 2021 Lumír Balhar - 2.0.8-1 -- Update to 2.0.8 -Resolves: rhbz#2026482 - -* Thu Oct 14 2021 Lumír Balhar - 2.0.7-1 -- Update to 2.0.7 -Resolves: rhbz#2013031 - -* Mon Sep 20 2021 Lumír Balhar - 2.0.6-1 -- Update to 2.0.6 -Resolves: rhbz#2004262 - -* Mon Aug 02 2021 Lumír Balhar - 2.0.4-1 -- Update to 2.0.4 -Resolves: rhbz#1988575 - -* Wed Jul 21 2021 Lumír Balhar - 2.0.3-1 -- Initial package diff --git a/python3.12-charset-normalizer.spec b/python3.12-charset-normalizer.spec index 3bc3239..f836659 100644 --- a/python3.12-charset-normalizer.spec +++ b/python3.12-charset-normalizer.spec @@ -1,6 +1,9 @@ -Name: python-charset-normalizer +%global __python3 /usr/bin/python3.12 +%global python3_pkgversion 3.12 + +Name: python%{python3_pkgversion}-charset-normalizer Version: 3.3.0 -Release: %autorelease +Release: 1%{?dist} Summary: The Real First Universal Charset Detector # SPDX License: MIT @@ -8,9 +11,10 @@ URL: https://github.com/ousret/charset_normalizer Source0: %{url}/archive/refs/tags/%{version}.tar.gz BuildArch: noarch -BuildRequires: python3-devel -BuildRequires: pyproject-rpm-macros -BuildRequires: python3dist(pytest) +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-rpm-macros +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-pytest %description @@ -19,37 +23,34 @@ Motivated by chardet, trying to resolve the issue by taking a new approach. All IANA character set names for which the Python core library provides codecs are supported. -%package -n python3-charset-normalizer -Summary: %{summary} - -%description -n python3-charset-normalizer -A library that helps you read text from an unknown charset encoding. -Motivated by chardet, trying to resolve the issue by taking -a new approach. All IANA character set names for which the Python core -library provides codecs are supported. %prep %autosetup -n charset_normalizer-%{version} # Remove pytest-cov settings from setup.cfg sed -i "/addopts = --cov/d" setup.cfg -%generate_buildrequires -%pyproject_buildrequires -r - %build -%pyproject_wheel +%py3_build %install -%pyproject_install -%pyproject_save_files charset_normalizer +%py3_install +mv %{buildroot}%{_bindir}/normalizer{,-%{python3_version}} %check %pytest -%files -n python3-charset-normalizer -f %{pyproject_files} +%files -n python%{python3_pkgversion}-charset-normalizer %license LICENSE %doc README.md -%{_bindir}/normalizer +%{_bindir}/normalizer-%{python3_pkgversion} +%{python3_sitelib}/charset_normalizer/ +%{python3_sitelib}/charset_normalizer-%{version}-py%{python3_pkgversion}.egg-info/ %changelog -%autochangelog +* Tue Oct 17 2023 Tomáš Hrnčiar - 3.3.0-1 +- Initial package +- Fedora contributions by: + Charalampos Stratakis + Gwyn Ciesla + Lumír Balhar +