From b7b17f58a8cb7e46266e9e8d819e5e1454087362 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:25:09 +0200 Subject: [PATCH 1/6] Rebuilt for Python 3.14 From 1e630924df9faba3e240d1bd31db4bd367583a68 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Thu, 17 Jul 2025 12:39:34 +0200 Subject: [PATCH 2/6] Update to 0.0.69 - Add Georgian console fonts - Add Adlm script to SN - Add dra, Tutg, ath, cmc, Cham, tai -Remove License classifier (license tag with SPDX license expression is already there) - Remove 0001-Georgian-add-georgian-console-fonts.patch (included upstream) - Stop using deprecated %py3_build/%py3_install macros Resolves: rhbz#2377304 --- .gitignore | 1 + ...-Georgian-add-georgian-console-fonts.patch | 46 ------------------- langtable.spec | 27 ++++------- sources | 2 +- 4 files changed, 12 insertions(+), 64 deletions(-) delete mode 100644 0001-Georgian-add-georgian-console-fonts.patch diff --git a/.gitignore b/.gitignore index fc67dd6..85b84d3 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ /langtable-0.0.66.tar.gz /langtable-0.0.67.tar.gz /langtable-0.0.68.tar.gz +/langtable-0.0.69.tar.gz diff --git a/0001-Georgian-add-georgian-console-fonts.patch b/0001-Georgian-add-georgian-console-fonts.patch deleted file mode 100644 index da093e5..0000000 --- a/0001-Georgian-add-georgian-console-fonts.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4ae3ebae62eecb1574fac122828c64c550900e5b Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 10 Jan 2025 11:22:39 -0800 -Subject: [PATCH] Georgian: add georgian console fonts - -LatCyrHebKa-16_GIA is newly created in -https://bugzilla.redhat.com/show_bug.cgi?id=2336875#c36 and -contributed to kbd in https://github.com/legionus/kbd/pull/127 -georgian16 is from console-setup. - -Signed-off-by: Adam Williamson ---- - langtable/data/languages.xml | 3 ++- - test_cases.py | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/langtable/data/languages.xml b/langtable/data/languages.xml -index 2d2ed5f..a5c1076 100644 ---- a/langtable/data/languages.xml -+++ b/langtable/data/languages.xml -@@ -24556,7 +24556,8 @@ - - - -- latarcyrheb-sun161000 -+ LatCyrHebKa-16_GIA1000 -+ georgian16900 - - - Asia/Tbilisi1000 -diff --git a/test_cases.py b/test_cases.py -index fe69a5c..f1d1328 100644 ---- a/test_cases.py -+++ b/test_cases.py -@@ -2169,7 +2169,7 @@ def dummy(): - >>> print(list_all_input_methods()) # doctest: +NORMALIZE_WHITESPACE - ['ibus/anthy', 'ibus/chewing', 'ibus/hangul', 'ibus/kkc', 'ibus/libpinyin', 'ibus/libzhuyin', 'ibus/m17n:ar:kbd', 'ibus/m17n:as:inscript2', 'ibus/m17n:bn:inscript2', 'ibus/m17n:brx:inscript2-deva', 'ibus/m17n:doi:inscript2-deva', 'ibus/m17n:gu:inscript2', 'ibus/m17n:hi:inscript2', 'ibus/m17n:kn:inscript2', 'ibus/m17n:kok:inscript2-deva', 'ibus/m17n:ks:inscript2-deva', 'ibus/m17n:ks:kbd', 'ibus/m17n:mai:inscript2', 'ibus/m17n:ml:inscript2', 'ibus/m17n:mni:inscript2-beng', 'ibus/m17n:mr:inscript2', 'ibus/m17n:ne:inscript2-deva', 'ibus/m17n:or:inscript2', 'ibus/m17n:pa:inscript2-guru', 'ibus/m17n:sa:inscript2', 'ibus/m17n:sat:inscript2-deva', 'ibus/m17n:sd:inscript2-deva', 'ibus/m17n:ta:inscript2', 'ibus/m17n:te:inscript2', 'ibus/m17n:ur:phonetic', 'ibus/m17n:vi:telex', 'ibus/table:cangjie5'] - >>> print(list_all_console_fonts()) # doctest: +NORMALIZE_WHITESPACE -- ['LatGrkCyr-8x16', 'eurlatgr', 'iso07u-16', 'latarcyrheb-sun16'] -+ ['LatCyrHebKa-16_GIA', 'LatGrkCyr-8x16', 'eurlatgr', 'georgian16', 'iso07u-16', 'latarcyrheb-sun16'] - ''' - - --- -2.47.1 - diff --git a/langtable.spec b/langtable.spec index 9bd4051..69e0b7c 100644 --- a/langtable.spec +++ b/langtable.spec @@ -1,5 +1,5 @@ Name: langtable -Version: 0.0.68 +Version: 0.0.69 Release: %autorelease Summary: Guessing reasonable defaults for locale, keyboard layout, territory, and language. # the translations in languages.xml and territories.xml are (mostly) @@ -9,14 +9,9 @@ Summary: Guessing reasonable defaults for locale, keyboard layout, territ License: GPL-3.0-or-later URL: https://github.com/mike-fabian/langtable Source0: https://github.com/mike-fabian/langtable/releases/download/%{version}/%{name}-%{version}.tar.gz -# https://github.com/mike-fabian/langtable/pull/24 -# https://bugzilla.redhat.com/show_bug.cgi?id=2336875 -# Prefer Georgian-capable console fonts for Georgian -Patch: 0001-Georgian-add-georgian-console-fonts.patch BuildArch: noarch BuildRequires: perl-interpreter BuildRequires: python3-devel -BuildRequires: python3-setuptools %description langtable is used to guess reasonable defaults for locale, keyboard layout, @@ -31,7 +26,6 @@ License: GPL-3.0-or-later Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-data < %{version}-%{release} Provides: %{name}-data = %{version}-%{release} -%{?python_provide:%python_provide python3-%{name}} %description -n python3-langtable This package contains a Python module to query the data @@ -39,20 +33,23 @@ from langtable-data. %prep %setup -q -gunzip langtable/data/languages.xml.gz -%patch 0 -p1 -gzip langtable/data/languages.xml + +%generate_buildrequires +%pyproject_buildrequires %build perl -pi -e "s,_DATADIR = '(.*)',_DATADIR = '%{_datadir}/langtable'," langtable/langtable.py -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files langtable %check +%pyproject_check_import + (cd $RPM_BUILD_DIR/%{name}-%{version}/langtable; %{__python3} langtable.py) (cd $RPM_BUILD_DIR/%{name}-%{version}; %{__python3} test_cases.py) xmllint --noout --relaxng \ @@ -75,11 +72,7 @@ xmllint --noout --relaxng \ %license COPYING unicode-license.txt %doc README* ChangeLog test_cases.py langtable/schemas/*.rng -%files -n python3-langtable -%dir %{python3_sitelib}/langtable -%{python3_sitelib}/langtable/* -%dir %{python3_sitelib}/langtable-*.egg-info -%{python3_sitelib}/langtable-*.egg-info/* +%files -n python3-langtable -f %{pyproject_files} %changelog %autochangelog diff --git a/sources b/sources index 90d030a..37b6ebe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (langtable-0.0.68.tar.gz) = fdb06a141b1ad3f62e8f6f6e7445c88059dd03d5c053e2dcbffaec79d38f688ffb39ef9270c720084ec13135fffca601afff6a14b4ff2ceb004b9bb39b892e2b +SHA512 (langtable-0.0.69.tar.gz) = c52669c52e2fbc2c857b358fc43a65e4a7e6f5f9adfed9f6340471992226574da94d2f1198105f946123451ece7ad55bc217bcc69fa16d3b528d838cd7990e69 From 40b6d5b31f95665af50975fbb63c65ecbf82ea93 Mon Sep 17 00:00:00 2001 From: Mike FABIAN Date: Thu, 17 Jul 2025 12:39:34 +0200 Subject: [PATCH 3/6] Update to 0.0.69 - Add Georgian console fonts - Add Adlm script to SN - Add dra, Tutg, ath, cmc, Cham, tai -Remove License classifier (license tag with SPDX license expression is already there) - Remove 0001-Georgian-add-georgian-console-fonts.patch (included upstream) - Stop using deprecated %py3_build/%py3_install macros Resolves: rhbz#2377304 --- .gitignore | 1 + ...-Georgian-add-georgian-console-fonts.patch | 46 ------------------- langtable.spec | 27 ++++------- sources | 2 +- 4 files changed, 12 insertions(+), 64 deletions(-) delete mode 100644 0001-Georgian-add-georgian-console-fonts.patch diff --git a/.gitignore b/.gitignore index fc67dd6..85b84d3 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ /langtable-0.0.66.tar.gz /langtable-0.0.67.tar.gz /langtable-0.0.68.tar.gz +/langtable-0.0.69.tar.gz diff --git a/0001-Georgian-add-georgian-console-fonts.patch b/0001-Georgian-add-georgian-console-fonts.patch deleted file mode 100644 index da093e5..0000000 --- a/0001-Georgian-add-georgian-console-fonts.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4ae3ebae62eecb1574fac122828c64c550900e5b Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Fri, 10 Jan 2025 11:22:39 -0800 -Subject: [PATCH] Georgian: add georgian console fonts - -LatCyrHebKa-16_GIA is newly created in -https://bugzilla.redhat.com/show_bug.cgi?id=2336875#c36 and -contributed to kbd in https://github.com/legionus/kbd/pull/127 -georgian16 is from console-setup. - -Signed-off-by: Adam Williamson ---- - langtable/data/languages.xml | 3 ++- - test_cases.py | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/langtable/data/languages.xml b/langtable/data/languages.xml -index 2d2ed5f..a5c1076 100644 ---- a/langtable/data/languages.xml -+++ b/langtable/data/languages.xml -@@ -24556,7 +24556,8 @@ - - - -- latarcyrheb-sun161000 -+ LatCyrHebKa-16_GIA1000 -+ georgian16900 - - - Asia/Tbilisi1000 -diff --git a/test_cases.py b/test_cases.py -index fe69a5c..f1d1328 100644 ---- a/test_cases.py -+++ b/test_cases.py -@@ -2169,7 +2169,7 @@ def dummy(): - >>> print(list_all_input_methods()) # doctest: +NORMALIZE_WHITESPACE - ['ibus/anthy', 'ibus/chewing', 'ibus/hangul', 'ibus/kkc', 'ibus/libpinyin', 'ibus/libzhuyin', 'ibus/m17n:ar:kbd', 'ibus/m17n:as:inscript2', 'ibus/m17n:bn:inscript2', 'ibus/m17n:brx:inscript2-deva', 'ibus/m17n:doi:inscript2-deva', 'ibus/m17n:gu:inscript2', 'ibus/m17n:hi:inscript2', 'ibus/m17n:kn:inscript2', 'ibus/m17n:kok:inscript2-deva', 'ibus/m17n:ks:inscript2-deva', 'ibus/m17n:ks:kbd', 'ibus/m17n:mai:inscript2', 'ibus/m17n:ml:inscript2', 'ibus/m17n:mni:inscript2-beng', 'ibus/m17n:mr:inscript2', 'ibus/m17n:ne:inscript2-deva', 'ibus/m17n:or:inscript2', 'ibus/m17n:pa:inscript2-guru', 'ibus/m17n:sa:inscript2', 'ibus/m17n:sat:inscript2-deva', 'ibus/m17n:sd:inscript2-deva', 'ibus/m17n:ta:inscript2', 'ibus/m17n:te:inscript2', 'ibus/m17n:ur:phonetic', 'ibus/m17n:vi:telex', 'ibus/table:cangjie5'] - >>> print(list_all_console_fonts()) # doctest: +NORMALIZE_WHITESPACE -- ['LatGrkCyr-8x16', 'eurlatgr', 'iso07u-16', 'latarcyrheb-sun16'] -+ ['LatCyrHebKa-16_GIA', 'LatGrkCyr-8x16', 'eurlatgr', 'georgian16', 'iso07u-16', 'latarcyrheb-sun16'] - ''' - - --- -2.47.1 - diff --git a/langtable.spec b/langtable.spec index 9bd4051..69e0b7c 100644 --- a/langtable.spec +++ b/langtable.spec @@ -1,5 +1,5 @@ Name: langtable -Version: 0.0.68 +Version: 0.0.69 Release: %autorelease Summary: Guessing reasonable defaults for locale, keyboard layout, territory, and language. # the translations in languages.xml and territories.xml are (mostly) @@ -9,14 +9,9 @@ Summary: Guessing reasonable defaults for locale, keyboard layout, territ License: GPL-3.0-or-later URL: https://github.com/mike-fabian/langtable Source0: https://github.com/mike-fabian/langtable/releases/download/%{version}/%{name}-%{version}.tar.gz -# https://github.com/mike-fabian/langtable/pull/24 -# https://bugzilla.redhat.com/show_bug.cgi?id=2336875 -# Prefer Georgian-capable console fonts for Georgian -Patch: 0001-Georgian-add-georgian-console-fonts.patch BuildArch: noarch BuildRequires: perl-interpreter BuildRequires: python3-devel -BuildRequires: python3-setuptools %description langtable is used to guess reasonable defaults for locale, keyboard layout, @@ -31,7 +26,6 @@ License: GPL-3.0-or-later Requires: %{name} = %{version}-%{release} Obsoletes: %{name}-data < %{version}-%{release} Provides: %{name}-data = %{version}-%{release} -%{?python_provide:%python_provide python3-%{name}} %description -n python3-langtable This package contains a Python module to query the data @@ -39,20 +33,23 @@ from langtable-data. %prep %setup -q -gunzip langtable/data/languages.xml.gz -%patch 0 -p1 -gzip langtable/data/languages.xml + +%generate_buildrequires +%pyproject_buildrequires %build perl -pi -e "s,_DATADIR = '(.*)',_DATADIR = '%{_datadir}/langtable'," langtable/langtable.py -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files langtable %check +%pyproject_check_import + (cd $RPM_BUILD_DIR/%{name}-%{version}/langtable; %{__python3} langtable.py) (cd $RPM_BUILD_DIR/%{name}-%{version}; %{__python3} test_cases.py) xmllint --noout --relaxng \ @@ -75,11 +72,7 @@ xmllint --noout --relaxng \ %license COPYING unicode-license.txt %doc README* ChangeLog test_cases.py langtable/schemas/*.rng -%files -n python3-langtable -%dir %{python3_sitelib}/langtable -%{python3_sitelib}/langtable/* -%dir %{python3_sitelib}/langtable-*.egg-info -%{python3_sitelib}/langtable-*.egg-info/* +%files -n python3-langtable -f %{pyproject_files} %changelog %autochangelog diff --git a/sources b/sources index 90d030a..37b6ebe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (langtable-0.0.68.tar.gz) = fdb06a141b1ad3f62e8f6f6e7445c88059dd03d5c053e2dcbffaec79d38f688ffb39ef9270c720084ec13135fffca601afff6a14b4ff2ceb004b9bb39b892e2b +SHA512 (langtable-0.0.69.tar.gz) = c52669c52e2fbc2c857b358fc43a65e4a7e6f5f9adfed9f6340471992226574da94d2f1198105f946123451ece7ad55bc217bcc69fa16d3b528d838cd7990e69 From 1ce7123c2d1a263067d267f2b68dba1b70867add Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:08:46 +0000 Subject: [PATCH 4/6] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 0cdc0be46c943e8c68ffa56fcc71990cf941e95e Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 12:54:45 +0200 Subject: [PATCH 5/6] Rebuilt for Python 3.14.0rc2 bytecode From f68d77ec7ebf2068178a6b97e5e7963c48508409 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 12:25:09 +0200 Subject: [PATCH 6/6] Rebuilt for Python 3.14.0rc3 bytecode