- Update to 19.8.18:
* Various country fixes - Remove merged patch pycountry-19.7.15-fix-reading-description.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pycountry?expand=0&rev=11
This commit is contained in:
parent
6edcc7c970
commit
31131b2835
@ -1,34 +0,0 @@
|
||||
From: Matthias Fehring <buschmann23@opensuse.org>
|
||||
Date: 2019-08-16 08:16:00 +0200
|
||||
Subject: fix reading description files
|
||||
Upstream: merged (https://bitbucket.org/flyingcircus/pycountry/pull-requests/26/read-readme-history-using-utf-8-encoding/diff)
|
||||
|
||||
When reading the description in setup.py the wrong encoding will
|
||||
be selected for the text files.
|
||||
|
||||
---
|
||||
setup.py | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
--- a/setup.py 2019-07-15 16:35:49.000000000 +0200
|
||||
+++ b/setup.py 2019-08-16 08:12:49.493720089 +0200
|
||||
@@ -3,6 +3,8 @@
|
||||
# Copyright 2015- (c) Flying Circus Internet Operations GmbH
|
||||
# See also LICENSE.txt
|
||||
|
||||
+from io import open
|
||||
+
|
||||
from setuptools import setup, find_packages
|
||||
|
||||
|
||||
@@ -14,8 +16,8 @@
|
||||
description='ISO country, subdivision, language, currency and script '
|
||||
'definitions and their translations',
|
||||
long_description=(
|
||||
- open('README.rst').read() + '\n' +
|
||||
- open('HISTORY.txt').read()),
|
||||
+ open('README.rst', encoding='utf-8').read() + '\n' +
|
||||
+ open('HISTORY.txt', encoding='utf-8').read()),
|
||||
license='LGPL 2.1',
|
||||
keywords='country subdivision language currency iso 3166 639 4217 '
|
||||
'15924 3166-2',
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:68e58bfd3bedeea49ba9d4b38f2bd5e042f9753628eba9a819fb03f551d89096
|
||||
size 10002566
|
3
pycountry-19.8.18.tar.gz
Normal file
3
pycountry-19.8.18.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3c57aa40adcf293d59bebaffbe60d8c39976fba78d846a018dc0c2ec9c6cb3cb
|
||||
size 10003160
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 10 12:35:50 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||
|
||||
- Update to 19.8.18:
|
||||
* Various country fixes
|
||||
- Remove merged patch pycountry-19.7.15-fix-reading-description.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 16 06:52:52 UTC 2019 - Matthias Fehring <buschmann23@opensuse.org>
|
||||
|
||||
|
@ -19,15 +19,13 @@
|
||||
%define real_name pycountry
|
||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
||||
Name: python-pycountry
|
||||
Version: 19.7.15
|
||||
Version: 19.8.18
|
||||
Release: 0
|
||||
Summary: Databases for ISO standards 639 3166 3166-2 4217 15924
|
||||
License: LGPL-2.1-only
|
||||
Group: Development/Libraries/Python
|
||||
URL: https://pypi.python.org/pypi/pycountry/
|
||||
Source: https://pypi.io/packages/source/p/%{real_name}/%{real_name}-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM pycountry-19.7.15-fix-reading-description.patch buschmann23@opensuse.org -- fix wrong enconding
|
||||
Patch0: pycountry-19.7.15-fix-reading-description.patch
|
||||
BuildRequires: %{python_module setuptools}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: python-rpm-macros
|
||||
@ -47,7 +45,6 @@ Translation files for the various strings are included as well.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{real_name}-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%python_build
|
||||
|
Loading…
Reference in New Issue
Block a user