From 14cbde1278e777257ab14bbab583fb3285e41772 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Thu, 30 May 2019 15:11:47 +0200
Subject: [PATCH] update to version 0.0.44

- Use setuptools instead of distutils
- Add a version() function and an info() function.
- Restructure langtable project a bit to be able to upload to PyPi
- Increase the rank of zh_SG.UTF-8 back to 10 again for languageId="zh"
- Remove old provides and obsoletes
---
 .gitignore     |  2 ++
 langtable.spec | 65 +++++++++++++++++++++++++-------------------------
 sources        |  2 +-
 3 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94e8b62..3c9723e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,5 @@
 /langtable-0.0.41.tar.gz
 /langtable-0.0.42.tar.gz
 /langtable-0.0.43.tar.gz
+/langtable-0.0.43.4.tar.gz
+/langtable-0.0.44.tar.gz
diff --git a/langtable.spec b/langtable.spec
index 84fb027..668b5d0 100644
--- a/langtable.spec
+++ b/langtable.spec
@@ -1,5 +1,5 @@
 Name:           langtable
-Version:        0.0.43
+Version:        0.0.44
 Release:        1%{?dist}
 Summary:        Guessing reasonable defaults for locale, keyboard layout, territory, and language.
 # the translations in languages.xml and territories.xml are (mostly)
@@ -24,61 +24,60 @@ already known.
 Summary:        Python module to query the langtable-data
 License:        GPLv3+
 Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-data = %{version}-%{release}
-# Remove before F30
-Provides:       %{name}-python3 = %{version}-%{release}
-Provides:       %{name}-python3%{?_isa} = %{version}-%{release}
-Obsoletes:      %{name}-python3 < %{version}-%{release}
 
 %description -n python3-langtable
 This package contains a Python module to query the data
 from langtable-data.
 
-%package data
-Summary:        Data files for langtable
-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
+perl -pi -e "s,_DATADIR = '(.*)',_DATADIR = '%{_datadir}/langtable'," langtable/langtable.py
 
 %py3_build
 
 %install
 
-%py3_install -- --install-data=%{_datadir}/langtable
-gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/langtable/*.xml
+%py3_install
 
 %check
-(cd $RPM_BUILD_DIR/%{name}-%{version}/data; 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
 
 %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
+* Fri May 31 2019 Mike FABIAN <mfabian@redhat.com> - 0.0.44-1
+- Use setuptools instead of distutils
+- Add a version() function and an info() function.
+- Restructure langtable project a bit to be able to upload to PyPi
+- Increase the rank of zh_SG.UTF-8 back to 10 again for languageId="zh"
+- Remove old provides and obsoletes
+
 * Fri May 10 2019 Mike FABIAN <mfabian@redhat.com> - 0.0.43-1
 - Get translation changes from CLDR
 - Add some new translations from CLDR
diff --git a/sources b/sources
index c04e65b..6417c00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (langtable-0.0.43.tar.gz) = 42905b48b722fb666b9a0dbc43e5329813f61b77d5d060e5e62c29cb7f975cbf6a67b25767b0c6f2ddaaea31d5a7620fd1f963772303fd44a5f9903aad7252e4
+SHA512 (langtable-0.0.44.tar.gz) = bc5da991a786e2014693bc74716f6b6b7593efeddcfe6c3b86b55b3f2a9194ff45ada3ed20e9d88c3dc352f0aa57703aa0f8656fb68616daa7be6ec6b24ca2dd