From 7cbdcbae0192ca0c3adcb471e470d4e6738f253138aae55624d4539474782c7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com> Date: Mon, 16 Sep 2019 07:35:14 +0000 Subject: [PATCH] Accepting request 731044 from home:jayvdb:py3only - Fix test data to use sys.executable OBS-URL: https://build.opensuse.org/request/show/731044 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pyxdg?expand=0&rev=18 --- python-pyxdg.changes | 5 +++++ python-pyxdg.spec | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/python-pyxdg.changes b/python-pyxdg.changes index a401e55..a3b1fb1 100644 --- a/python-pyxdg.changes +++ b/python-pyxdg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Sep 15 06:48:50 UTC 2019 - John Vandenberg <jayvdb@gmail.com> + +- Fix test data to use sys.executable + ------------------------------------------------------------------- Wed Apr 24 13:12:09 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com> diff --git a/python-pyxdg.spec b/python-pyxdg.spec index 71521bf..d1d510d 100644 --- a/python-pyxdg.spec +++ b/python-pyxdg.spec @@ -28,6 +28,7 @@ URL: http://freedesktop.org/wiki/Software/pyxdg Source: https://files.pythonhosted.org/packages/source/p/pyxdg/pyxdg-%{version}.tar.gz Patch0: resource_leak.patch BuildRequires: %{python_module nose} +BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: python-rpm-macros BuildRequires: shared-mime-info @@ -60,10 +61,15 @@ PyXDG is a python library to access freedesktop.org standards. Currently support %install %python_install +%python_expand %fdupes %{buildroot}%{python_sitelib} %check +# https://gitlab.freedesktop.org/xdg/pyxdg/issues/15 # test_get_type{,2} both fail but come from s-m-i package for data -%python_expand nosetests-%{$python_bin_suffix} -e test_get_type* +# https://gitlab.freedesktop.org/xdg/pyxdg/merge_requests/4 +%{python_expand sed -i "s/Exec=python.*$/Exec=$python/" test/resources.py +nosetests-%{$python_bin_suffix} -e test_get_type* +} %files %{python_files} %license COPYING