Compare commits
5 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f68d77ec7e | ||
|
|
0cdc0be46c | ||
|
|
1ce7123c2d | ||
|
|
1e630924df | ||
|
|
b7b17f58a8 |
4 changed files with 12 additions and 64 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -67,3 +67,4 @@
|
||||||
/langtable-0.0.66.tar.gz
|
/langtable-0.0.66.tar.gz
|
||||||
/langtable-0.0.67.tar.gz
|
/langtable-0.0.67.tar.gz
|
||||||
/langtable-0.0.68.tar.gz
|
/langtable-0.0.68.tar.gz
|
||||||
|
/langtable-0.0.69.tar.gz
|
||||||
|
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
From 4ae3ebae62eecb1574fac122828c64c550900e5b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Adam Williamson <awilliam@redhat.com>
|
|
||||||
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 <awilliam@redhat.com>
|
|
||||||
---
|
|
||||||
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 @@
|
|
||||||
<inputmethods>
|
|
||||||
</inputmethods>
|
|
||||||
<consolefonts>
|
|
||||||
- <consolefont><consolefontId>latarcyrheb-sun16</consolefontId><rank>1000</rank></consolefont>
|
|
||||||
+ <consolefont><consolefontId>LatCyrHebKa-16_GIA</consolefontId><rank>1000</rank></consolefont>
|
|
||||||
+ <consolefont><consolefontId>georgian16</consolefontId><rank>900</rank></consolefont>
|
|
||||||
</consolefonts>
|
|
||||||
<timezones>
|
|
||||||
<timezone><timezoneId>Asia/Tbilisi</timezoneId><rank>1000</rank></timezone>
|
|
||||||
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
|
|
||||||
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
Name: langtable
|
Name: langtable
|
||||||
Version: 0.0.68
|
Version: 0.0.69
|
||||||
Release: %autorelease
|
Release: %autorelease
|
||||||
Summary: Guessing reasonable defaults for locale, keyboard layout, territory, and language.
|
Summary: Guessing reasonable defaults for locale, keyboard layout, territory, and language.
|
||||||
# the translations in languages.xml and territories.xml are (mostly)
|
# 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
|
License: GPL-3.0-or-later
|
||||||
URL: https://github.com/mike-fabian/langtable
|
URL: https://github.com/mike-fabian/langtable
|
||||||
Source0: https://github.com/mike-fabian/langtable/releases/download/%{version}/%{name}-%{version}.tar.gz
|
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
|
BuildArch: noarch
|
||||||
BuildRequires: perl-interpreter
|
BuildRequires: perl-interpreter
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
BuildRequires: python3-setuptools
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
langtable is used to guess reasonable defaults for locale, keyboard layout,
|
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}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Obsoletes: %{name}-data < %{version}-%{release}
|
Obsoletes: %{name}-data < %{version}-%{release}
|
||||||
Provides: %{name}-data = %{version}-%{release}
|
Provides: %{name}-data = %{version}-%{release}
|
||||||
%{?python_provide:%python_provide python3-%{name}}
|
|
||||||
|
|
||||||
%description -n python3-langtable
|
%description -n python3-langtable
|
||||||
This package contains a Python module to query the data
|
This package contains a Python module to query the data
|
||||||
|
|
@ -39,20 +33,23 @@ from langtable-data.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
gunzip langtable/data/languages.xml.gz
|
|
||||||
%patch 0 -p1
|
%generate_buildrequires
|
||||||
gzip langtable/data/languages.xml
|
%pyproject_buildrequires
|
||||||
|
|
||||||
%build
|
%build
|
||||||
perl -pi -e "s,_DATADIR = '(.*)',_DATADIR = '%{_datadir}/langtable'," langtable/langtable.py
|
perl -pi -e "s,_DATADIR = '(.*)',_DATADIR = '%{_datadir}/langtable'," langtable/langtable.py
|
||||||
|
|
||||||
%py3_build
|
%pyproject_wheel
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
||||||
%py3_install
|
%pyproject_install
|
||||||
|
%pyproject_save_files langtable
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
%pyproject_check_import
|
||||||
|
|
||||||
(cd $RPM_BUILD_DIR/%{name}-%{version}/langtable; %{__python3} langtable.py)
|
(cd $RPM_BUILD_DIR/%{name}-%{version}/langtable; %{__python3} langtable.py)
|
||||||
(cd $RPM_BUILD_DIR/%{name}-%{version}; %{__python3} test_cases.py)
|
(cd $RPM_BUILD_DIR/%{name}-%{version}; %{__python3} test_cases.py)
|
||||||
xmllint --noout --relaxng \
|
xmllint --noout --relaxng \
|
||||||
|
|
@ -75,11 +72,7 @@ xmllint --noout --relaxng \
|
||||||
%license COPYING unicode-license.txt
|
%license COPYING unicode-license.txt
|
||||||
%doc README* ChangeLog test_cases.py langtable/schemas/*.rng
|
%doc README* ChangeLog test_cases.py langtable/schemas/*.rng
|
||||||
|
|
||||||
%files -n python3-langtable
|
%files -n python3-langtable -f %{pyproject_files}
|
||||||
%dir %{python3_sitelib}/langtable
|
|
||||||
%{python3_sitelib}/langtable/*
|
|
||||||
%dir %{python3_sitelib}/langtable-*.egg-info
|
|
||||||
%{python3_sitelib}/langtable-*.egg-info/*
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
%autochangelog
|
%autochangelog
|
||||||
|
|
|
||||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
SHA512 (langtable-0.0.68.tar.gz) = fdb06a141b1ad3f62e8f6f6e7445c88059dd03d5c053e2dcbffaec79d38f688ffb39ef9270c720084ec13135fffca601afff6a14b4ff2ceb004b9bb39b892e2b
|
SHA512 (langtable-0.0.69.tar.gz) = c52669c52e2fbc2c857b358fc43a65e4a7e6f5f9adfed9f6340471992226574da94d2f1198105f946123451ece7ad55bc217bcc69fa16d3b528d838cd7990e69
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue