- Rearrange and reapply patches.

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

python-columnize.spec

@@ -27,14 +27,17 @@ Summary:        Format a simple (i.e. not nested) list into aligned columns
 URL:            https://github.com/rocky/pycolumnize
 Group:          Development/Languages/Python
 Source0:        https://files.pythonhosted.org/packages/source/c/columnize/columnize-%{version}.tar.gz
-# Include test file missed from being included in source tarball
-Source1:        https://raw.githubusercontent.com/rocky/pycolumnize/%{version}/test_columnize.py
+# Include test file missed from being included in source tarball gh#rocky/pycolumnize#29
+# https://raw.githubusercontent.com/rocky/pycolumnize/%%{version}/test_columnize.py
+Source1:        test_columnize.py
 # PATCH-FEATURE-OPENSUSE drop-nose-requirement.patch badshah400@gmail.com -- Drop requirement on outdated nose; we do not run tests anyway
 Patch0:         drop-nose-requirement.patch
+# PATCH-FIX-UPSTREAM python-columnize-no-mock.patch gh#rocky/pycolumnize#28 mcepl@suse.com
+# remove the need for external mock package
+Patch1:         python-columnize-no-mock.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  python-rpm-macros
 # SECTION For tests
-BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module pytest}
 # /SECTION
 BuildRequires:  fdupes
@@ -48,8 +51,6 @@ Format a simple (i.e. not nested) list into aligned columns.
 %prep
 %autosetup -p1 -n columnize-%{version}
 cp %{SOURCE1} ./
-# https://github.com/rocky/pycolumnize/issues/28
-sed -i 's:mock:unittest.mock:' test_columnize.py
 
 %build
 %python_build