diff --git a/chardet-3.0.4.tar.gz b/chardet-3.0.4.tar.gz deleted file mode 100644 index 9501cc9..0000000 --- a/chardet-3.0.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae -size 1868453 diff --git a/chardet-4.0.0.tar.gz b/chardet-4.0.0.tar.gz new file mode 100644 index 0000000..a3c7d96 --- /dev/null +++ b/chardet-4.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa +size 1907771 diff --git a/pytest4.patch b/pytest4.patch deleted file mode 100644 index 1059b07..0000000 --- a/pytest4.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Tue, 12 Mar 2019 18:44:36 +0100 -Subject: [PATCH] Support pytest 4, don't apply marks directly to parameters - -Fixes https://github.com/chardet/chardet/issues/173 ---- - test.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test.py b/test.py -index 9833307..ad2b753 100644 ---- a/test.py -+++ b/test.py -@@ -59,7 +59,7 @@ def gen_test_params(): - full_path = join(path, file_name) - test_case = full_path, encoding - if full_path in EXPECTED_FAILURES: -- test_case = pytest.mark.xfail(test_case) -+ test_case = pytest.param(*test_case, marks=pytest.mark.xfail) - yield test_case - - diff --git a/python-chardet-rpmlintrc b/python-chardet-rpmlintrc deleted file mode 100644 index bb1d6f0..0000000 --- a/python-chardet-rpmlintrc +++ /dev/null @@ -1,3 +0,0 @@ -# remove warnings about modules not being executable -addFilter("non-executable-script") - diff --git a/python-chardet.changes b/python-chardet.changes index 1f6e421..8006982 100644 --- a/python-chardet.changes +++ b/python-chardet.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Dec 20 05:52:28 UTC 2020 - John Vandenberg + +- Remove now unnecessary pytest4.patch and python-chardet-rpmlintrc +- Update to v4.0.0 + See https://github.com/chardet/chardet/compare/3.0.4...4.0.0 + ------------------------------------------------------------------- Mon Oct 14 11:45:00 UTC 2019 - Matej Cepl diff --git a/python-chardet.spec b/python-chardet.spec index 50dab86..b5c3bd8 100644 --- a/python-chardet.spec +++ b/python-chardet.spec @@ -1,7 +1,7 @@ # # spec file for package python-chardet # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,14 +26,12 @@ %bcond_with test %endif Name: python-chardet%{psuffix} -Version: 3.0.4 +Version: 4.0.0 Release: 0 Summary: Universal encoding detector License: LGPL-2.1-or-later URL: https://github.com/chardet/chardet Source0: https://files.pythonhosted.org/packages/source/c/chardet/chardet-%{version}.tar.gz -Source1: python-chardet-rpmlintrc -Patch0: pytest4.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -77,7 +75,7 @@ or more files:: %prep %setup -q -n chardet-%{version} -%patch0 -p1 +sed -i '1{/^#!/d}' chardet/lang*model.py chardet/metadata/languages.py %build %python_build