diff --git a/.gitignore b/.gitignore index eea8121..38cdfbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /pycountry-18.12.8.tar.gz +/pycountry-19.8.18.tar.gz diff --git a/00-use_system_iso-codes.patch b/00-use_system_iso-codes.patch index 23de9a7..acc078e 100644 --- a/00-use_system_iso-codes.patch +++ b/00-use_system_iso-codes.patch @@ -2,14 +2,14 @@ # User David Paleino # Date 1544770987 18000 # Fri Dec 14 02:03:07 2018 -0500 -# Node ID a3985a161774c2edc1a971e855c95bba2b659bc9 -# Parent dbc5a081e509a0f099449d8e2367ea4826b20f76 +# Node ID e02a9eb90790c57ce107633dc4a03f70a4a6b5ae +# Parent 094324a0a9c7d0d7c2a060a1b17d4ecd8504beb3 Use system iso-codes. diff --git a/src/pycountry/__init__.py b/src/pycountry/__init__.py --- a/src/pycountry/__init__.py +++ b/src/pycountry/__init__.py -@@ -12,8 +12,8 @@ except ImportError: +@@ -13,8 +13,8 @@ except ImportError: return os.path.join(os.path.dirname(__file__), resource_name) @@ -19,28 +19,34 @@ diff --git a/src/pycountry/__init__.py b/src/pycountry/__init__.py +DATABASE_DIR = '/usr/share/iso-codes/json' - class ExistingCountries(pycountry.db.Database): -@@ -109,10 +109,10 @@ class Subdivisions(pycountry.db.Database + def remove_accents(input_str): +@@ -191,15 +191,15 @@ class Subdivisions(pycountry.db.Database return subdivisions -countries = ExistingCountries(os.path.join(DATABASE_DIR, 'iso3166-1.json')) +-subdivisions = Subdivisions(os.path.join(DATABASE_DIR, 'iso3166-2.json')) +countries = ExistingCountries(os.path.join(DATABASE_DIR, 'iso_3166-1.json')) ++subdivisions = Subdivisions(os.path.join(DATABASE_DIR, 'iso_3166-2.json')) historic_countries = HistoricCountries( - os.path.join(DATABASE_DIR, 'iso3166-3.json')) --scripts = Scripts(os.path.join(DATABASE_DIR, 'iso15924.json')) --currencies = Currencies(os.path.join(DATABASE_DIR, 'iso4217.json')) --languages = Languages(os.path.join(DATABASE_DIR, 'iso639-3.json')) --subdivisions = Subdivisions(os.path.join(DATABASE_DIR, 'iso3166-2.json')) + os.path.join(DATABASE_DIR, 'iso_3166-3.json')) -+scripts = Scripts(os.path.join(DATABASE_DIR, 'iso_15924.json')) + +-currencies = Currencies(os.path.join(DATABASE_DIR, 'iso4217.json')) +currencies = Currencies(os.path.join(DATABASE_DIR, 'iso_4217.json')) + +-languages = Languages(os.path.join(DATABASE_DIR, 'iso639-3.json')) +languages = Languages(os.path.join(DATABASE_DIR, 'iso_639-3.json')) -+subdivisions = Subdivisions(os.path.join(DATABASE_DIR, 'iso_3166-2.json')) + language_families = LanguageFamilies( +- os.path.join(DATABASE_DIR, 'iso639-5.json')) ++ os.path.join(DATABASE_DIR, 'iso_639-5.json')) + +-scripts = Scripts(os.path.join(DATABASE_DIR, 'iso15924.json')) ++scripts = Scripts(os.path.join(DATABASE_DIR, 'iso_15924.json')) diff --git a/src/pycountry/tests/test_general.py b/src/pycountry/tests/test_general.py --- a/src/pycountry/tests/test_general.py +++ b/src/pycountry/tests/test_general.py -@@ -89,7 +89,7 @@ def test_languages(): +@@ -132,7 +132,7 @@ def test_language_families(): def test_locales(): german = gettext.translation( diff --git a/python-pycountry.spec b/python-pycountry.spec index b2a7164..77db86c 100644 --- a/python-pycountry.spec +++ b/python-pycountry.spec @@ -1,8 +1,8 @@ %global srcname pycountry Name: python-%{srcname} -Version: 18.12.8 -Release: 3%{?dist} +Version: 19.8.18 +Release: 1%{?dist} Summary: ISO country, subdivision, language, currency and script definitions and their translations License: LGPLv2 @@ -68,13 +68,16 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} PYTHONDONTWRITEBYTECODE=1 \ %files -n python3-%{srcname} -%doc README HISTORY.txt +%doc README.rst HISTORY.txt %license LICENSE.txt %{python3_sitelib}/%{srcname} %{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info %changelog +* Mon Aug 19 2019 Elliott Sales de Andrade - 19.8.18-1 +- Update to latest version + * Fri Jul 26 2019 Fedora Release Engineering - 18.12.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 30c4d82..728fc8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pycountry-18.12.8.tar.gz) = 9797688ada8ea54c1a56a2cf4d0ad765001816c822c40077953fa71e3af285114c4b5beaf739a24432b9c6ea794952ce347a40ae0bcd9a2c00d12ddc7b45261e +SHA512 (pycountry-19.8.18.tar.gz) = 39ba06629eeea55460424d06992ca5f1e5bf6168b219dc4880ec326f6aa0c92a4fdc54d4143a8b8bb1490149af793e760e291c6d704104a57ba91e88228ab669