- Remove pytest4.patch and replace it with pytest4-02.patch,

which is the upstream gh#hamcrest/PyHamcrest#124 fixing
  compatibility with pytest 4+ officially.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-PyHamcrest?expand=0&rev=16

python-PyHamcrest.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-PyHamcrest
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,9 +27,12 @@ URL:            https://github.com/hamcrest/PyHamcrest
 #Source:         https://files.pythonhosted.org/packages/source/P/PyHamcrest/PyHamcrest-%%{version}.tar.gz
 Source:         https://github.com/hamcrest/PyHamcrest/archive/V%{version}.tar.gz
 Patch0:         0001-Add-boolean-matchers.patch
-# PATCH-FIX-UPSTREAM pytest4.patch gh#hamcrest/PyHamcrest#123 mcepl@suse.com
-# eliminate non-compatible test case
-Patch1:         pytest4.patch
+# # PATCH-FIX-UPSTREAM pytest4.patch gh#hamcrest/PyHamcrest#123 mcepl@suse.com
+# # eliminate non-compatible test case
+# Patch1:         pytest4.patch
+# PATCH-FIX-UPSTREAM pytest4-02.patch gh#hamcrest/PyHamcrest#123 mcepl@suse.com
+# compatibility with pytest4+ (from gh#hamcrest/PyHamcrest#124)
+Patch1:         pytest4-02.patch
 BuildRequires:  %{python_module hypothesis >= 1.11}
 BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module pytest}
@@ -39,7 +42,7 @@ BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-six >= 1.4
 Provides:       python-hamcrest = %{version}
-Obsoletes:      python-hamcrest
+Obsoletes:      python-hamcrest < %{version}
 BuildArch:      noarch
 %python_subpackages