From d0148138ca327ba574e2fb75c664730b9bbbf0b5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 3 Nov 2020 07:06:23 -0500 Subject: [PATCH] import langtable-0.0.51-4.el8 --- .gitignore | 2 +- .langtable.metadata | 2 +- SPECS/langtable.spec | 111 +++++++++++++++++-------------------------- 3 files changed, 46 insertions(+), 69 deletions(-) diff --git a/.gitignore b/.gitignore index e6f80bd..73c9140 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/langtable-0.0.38.tar.gz +SOURCES/langtable-0.0.51.tar.gz diff --git a/.langtable.metadata b/.langtable.metadata index 79eb68a..a7fb3ab 100644 --- a/.langtable.metadata +++ b/.langtable.metadata @@ -1 +1 @@ -03991a1aa1de4a0395bbcf91e90176e11dee13d1 SOURCES/langtable-0.0.38.tar.gz +61f89b59797313bfc39d98ff280ef6d458f79b82 SOURCES/langtable-0.0.51.tar.gz diff --git a/SPECS/langtable.spec b/SPECS/langtable.spec index 8324e3f..5ebb8fe 100644 --- a/SPECS/langtable.spec +++ b/SPECS/langtable.spec @@ -1,10 +1,6 @@ -%if 0%{?fedora} -%global with_python2 1 -%endif - Name: langtable -Version: 0.0.38 -Release: 5%{?dist} +Version: 0.0.51 +Release: 4%{?dist} Summary: Guessing reasonable defaults for locale, keyboard layout, territory, and language. Group: Development/Tools # the translations in languages.xml and territories.xml are (mostly) @@ -16,9 +12,7 @@ URL: https://github.com/mike-fabian/langtable Source0: https://github.com/mike-fabian/langtable/releases/download/%{version}/%{name}-%{version}.tar.gz BuildArch: noarch BuildRequires: perl-interpreter -%if 0%{?with_python2} -BuildRequires: python2-devel -%endif + BuildRequires: python3-devel %description @@ -28,29 +22,13 @@ example, guess the territory and the keyboard layout if the language is known or guess the language and keyboard layout if the territory is already known. -%if 0%{?with_python2} -%package -n python2-langtable -%{?python_provide:%python_provide python2-langtable} -# Remove before F30 -Provides: %{name}-python%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python < %{version}-%{release} -Summary: Python module to query the langtable-data -Group: Development/Tools -License: GPLv3+ -Requires: %{name} = %{version}-%{release} -Requires: %{name}-data = %{version}-%{release} - -%description -n python2-langtable -This package contains a Python module to query the data -from langtable-data. -%endif - %package -n python3-langtable Summary: Python module to query the langtable-data Group: Development/Tools License: GPLv3+ Requires: %{name} = %{version}-%{release} -Requires: %{name}-data = %{version}-%{release} +Obsoletes: %{name}-data < %{version}-%{release} +Provides: %{name}-data = %{version}-%{release} # Remove before F30 Provides: %{name}-python3 = %{version}-%{release} Provides: %{name}-python3%{?_isa} = %{version}-%{release} @@ -60,54 +38,40 @@ Obsoletes: %{name}-python3 < %{version}-%{release} This package contains a Python module to query the data from langtable-data. -%package data -Summary: Data files for langtable -Group: Development/Tools -License: GPLv3+ and MIT -Requires: %{name} = %{version}-%{release} - -%description data -This package contains the data files for langtable. - %prep %setup -q %build perl -pi -e "s,_datadir = '(.*)',_datadir = '%{_datadir}/langtable'," langtable.py -%if 0%{?with_python2} -%py2_build -%endif %py3_build %install -%if 0%{?with_python2} -%py2_install -- --install-data=%{_datadir}/langtable -gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/langtable/*.xml -%endif -%py3_install -- --install-data=%{_datadir}/langtable -# the .xml files copied by the “python3 setup.py install” are identical -# to those copied in the “python2 setup.py install”, -# it does not hurt to gzip them again: -gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/langtable/*.xml +%py3_install %check -%if 0%{?with_python2} -(cd $RPM_BUILD_DIR/%{name}-%{version}/data; PYTHONPATH=.. %{__python2} ../test_cases.py; %{__python2} ../langtable.py) -%endif -(cd $RPM_BUILD_DIR/%{name}-%{version}/data; LC_CTYPE=en_US.UTF-8 PYTHONPATH=.. %{__python3} ../test_cases.py; %{__python3} ../langtable.py) -xmllint --noout --relaxng $RPM_BUILD_ROOT/%{_datadir}/langtable/schemas/keyboards.rng $RPM_BUILD_ROOT/%{_datadir}/langtable/keyboards.xml.gz -xmllint --noout --relaxng $RPM_BUILD_ROOT/%{_datadir}/langtable/schemas/languages.rng $RPM_BUILD_ROOT/%{_datadir}/langtable/languages.xml.gz -xmllint --noout --relaxng $RPM_BUILD_ROOT/%{_datadir}/langtable/schemas/territories.rng $RPM_BUILD_ROOT/%{_datadir}/langtable/territories.xml.gz -xmllint --noout --relaxng $RPM_BUILD_ROOT/%{_datadir}/langtable/schemas/timezoneidparts.rng $RPM_BUILD_ROOT/%{_datadir}/langtable/timezoneidparts.xml.gz -xmllint --noout --relaxng $RPM_BUILD_ROOT/%{_datadir}/langtable/schemas/timezones.rng $RPM_BUILD_ROOT/%{_datadir}/langtable/timezones.xml.gz +(cd $RPM_BUILD_DIR/%{name}-%{version}/langtable; %{__python3} langtable.py) +(cd $RPM_BUILD_DIR/%{name}-%{version}; %{__python3} test_cases.py) +xmllint --noout --relaxng \ + $RPM_BUILD_DIR/%{name}-%{version}/langtable/schemas/keyboards.rng \ + $RPM_BUILD_DIR/%{name}-%{version}/langtable/data/keyboards.xml.gz +xmllint --noout --relaxng \ + $RPM_BUILD_DIR/%{name}-%{version}/langtable/schemas/languages.rng \ + $RPM_BUILD_DIR/%{name}-%{version}/langtable/data/languages.xml.gz +xmllint --noout --relaxng \ + $RPM_BUILD_DIR/%{name}-%{version}/langtable/schemas/territories.rng \ + $RPM_BUILD_DIR/%{name}-%{version}/langtable/data/territories.xml.gz +xmllint --noout --relaxng \ + $RPM_BUILD_DIR/%{name}-%{version}/langtable/schemas/timezoneidparts.rng \ + $RPM_BUILD_DIR/%{name}-%{version}/langtable/data/timezoneidparts.xml.gz +xmllint --noout --relaxng \ + $RPM_BUILD_DIR/%{name}-%{version}/langtable/schemas/timezones.rng \ + $RPM_BUILD_DIR/%{name}-%{version}/langtable/data/timezones.xml.gz %files %license COPYING unicode-license.txt -%doc README ChangeLog test_cases.py -%dir %{_datadir}/langtable/ -%{_datadir}/langtable/schemas +%doc README ChangeLog test_cases.py langtable/schemas/*.rng %if 0%{?with_python2} %files -n python2-langtable @@ -115,15 +79,28 @@ xmllint --noout --relaxng $RPM_BUILD_ROOT/%{_datadir}/langtable/schemas/timezone %endif %files -n python3-langtable -%{python3_sitelib}/langtable.py -%{python3_sitelib}/langtable-*.egg-info -%{python3_sitelib}/__pycache__/* - -%files data -%dir %{_datadir}/langtable/ -%{_datadir}/langtable/*.xml.gz +%dir %{python3_sitelib}/langtable +%{python3_sitelib}/langtable/* +%dir %{python3_sitelib}/langtable-*.egg-info +%{python3_sitelib}/langtable-*.egg-info/* %changelog +* Mon May 25 2020 Mike FABIAN - 0.0.51-4 +- Fix wrong date in changelog. +- Related: rhbz#1682172 + +* Mon May 25 2020 Mike FABIAN - 0.0.51-3 +- gating.yaml added by Radek Vykydal +- Related: rhbz#1682172 + +* Tue May 19 2020 Mike FABIAN - 0.0.51-2 +- Add CI tests +- Resolves: rhbz#1682172 + +* Mon May 04 2020 Mike FABIAN - 0.0.51-1 +- Rebase to 0.0.51 +- Resolves: rhbz#1816635 + * Tue Apr 10 2018 Pete Walter - 0.0.38-5 - Conditionally add back Python 2 subpackage on Fedora - Rename Python 3 subpackage to python3-langtable to follow guidelines