diff --git a/autojump-no-mock.patch b/autojump-no-mock.patch new file mode 100644 index 0000000..19eaade --- /dev/null +++ b/autojump-no-mock.patch @@ -0,0 +1,14 @@ +diff --git a/tests/unit/autojump_utils_test.py b/tests/unit/autojump_utils_test.py +index 07f67b3..386b4cd 100644 +--- a/tests/unit/autojump_utils_test.py ++++ b/tests/unit/autojump_utils_test.py +@@ -3,7 +3,7 @@ + import os + import sys + +-import mock ++from unittest import mock + import pytest + + sys.path.append(os.path.join(os.getcwd(), 'bin')) # noqa + diff --git a/autojump.changes b/autojump.changes index 99097d5..03b0350 100644 --- a/autojump.changes +++ b/autojump.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Apr 22 12:07:10 UTC 2022 - pgajdos@suse.com + +- do not require pytest-mock for build +- added patches + fix https://github.com/wting/autojump/pull/648 + + autojump-no-mock.patch + ------------------------------------------------------------------- Thu Oct 17 13:57:31 UTC 2019 - Richard Brown diff --git a/autojump.spec b/autojump.spec index 03a189c..84d3baf 100644 --- a/autojump.spec +++ b/autojump.spec @@ -1,7 +1,7 @@ # # spec file for package autojump # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,10 +21,12 @@ Version: 22.5.3 Release: 0 Summary: A faster way to navigate the filesystem from a shell License: GPL-3.0-or-later -Url: https://github.com/wting/autojump +URL: https://github.com/wting/autojump Source: https://github.com/wting/autojump/archive/release-v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# https://github.com/wting/autojump/pull/648 +Patch0: autojump-no-mock.patch +BuildRequires: python-rpm-macros BuildRequires: python3 -BuildRequires: python3-mock BuildRequires: python3-pytest BuildArch: noarch @@ -37,6 +39,7 @@ Directories must be visited first before they can be jumped to. %prep %setup -q -n %{name}-release-v%{version} +%patch0 -p1 # Fix shebangs. sed -i 's/env python$/python3/' bin/%{name}