From b1ff472d5e39ec745abb22abdf161cd7dd7854332fb51c197c1ee9ed972dcb7c Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Thu, 17 Oct 2019 14:39:30 +0000 Subject: [PATCH 1/2] Accepting request 739749 from home:RBrownSUSE:branches:utilities Remove obsolete Groups tag (fate#326485) OBS-URL: https://build.opensuse.org/request/show/739749 OBS-URL: https://build.opensuse.org/package/show/utilities/autojump?expand=0&rev=6 --- autojump.changes | 5 +++++ autojump.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/autojump.changes b/autojump.changes index 3aa95c5..99097d5 100644 --- a/autojump.changes +++ b/autojump.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 13:57:31 UTC 2019 - Richard Brown + +- Remove obsolete Groups tag (fate#326485) + ------------------------------------------------------------------- Sat Apr 13 04:02:37 UTC 2019 - Dilawar Singh diff --git a/autojump.spec b/autojump.spec index fac1a17..03a189c 100644 --- a/autojump.spec +++ b/autojump.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,7 +21,6 @@ Version: 22.5.3 Release: 0 Summary: A faster way to navigate the filesystem from a shell License: GPL-3.0-or-later -Group: System/Console Url: https://github.com/wting/autojump Source: https://github.com/wting/autojump/archive/release-v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: python3 From bb58b2f5608009614dc5bb7ad9438ecb6d9d047f516ff9404ca3a02636c2aa25 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 25 Apr 2022 08:20:27 +0000 Subject: [PATCH 2/2] Accepting request 972173 from home:pgajdos:python - do not require pytest-mock for build - added patches fix https://github.com/wting/autojump/pull/648 + autojump-no-mock.patch OBS-URL: https://build.opensuse.org/request/show/972173 OBS-URL: https://build.opensuse.org/package/show/utilities/autojump?expand=0&rev=7 --- autojump-no-mock.patch | 14 ++++++++++++++ autojump.changes | 8 ++++++++ autojump.spec | 9 ++++++--- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 autojump-no-mock.patch 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}