diff --git a/new-api.patch b/new-api.patch new file mode 100644 index 0000000..95ebf33 --- /dev/null +++ b/new-api.patch @@ -0,0 +1,30 @@ +diff --git a/xdg/Menu.py b/xdg/Menu.py +index 1d03cad591668f8297882ad8ff3656fbc8062ff1..c27eee2b054f903ae66727dcaee5563f3bebf8ee 100644 +--- a/xdg/Menu.py ++++ b/xdg/Menu.py +@@ -298,11 +298,11 @@ class Menu: + entry.Show = NO_EXEC + self.Visible -= 1 + elif xdg.Config.windowmanager: +- if (entry.DesktopEntry.OnlyShowIn != [] and ( +- xdg.Config.windowmanager not in entry.DesktopEntry.OnlyShowIn ++ if (entry.DesktopEntry.getOnlyShowIn() != [] and ( ++ xdg.Config.windowmanager not in entry.DesktopEntry.getOnlyShowIn() + ) + ) or ( +- xdg.Config.windowmanager in entry.DesktopEntry.NotShowIn ++ xdg.Config.windowmanager in entry.DesktopEntry.getNotShowIn() + ): + entry.Show = NOT_SHOW_IN + self.Visible -= 1 +@@ -994,8 +994,8 @@ class XMLMenuBuilder(object): + menuentry = MenuEntry(directory, dir) + if not menu.Directory: + menu.Directory = menuentry +- elif menuentry.Type == MenuEntry.TYPE_SYSTEM: +- if menu.Directory.Type == MenuEntry.TYPE_USER: ++ elif menuentry.getType() == MenuEntry.TYPE_SYSTEM: ++ if menu.Directory.getType() == MenuEntry.TYPE_USER: + menu.Directory.Original = menuentry + if menu.Directory: + break diff --git a/python-pyxdg.changes b/python-pyxdg.changes index a3b1fb1..6654689 100644 --- a/python-pyxdg.changes +++ b/python-pyxdg.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Mar 2 08:27:33 UTC 2020 - Tomáš Chvátal + +- Add setuptools dependency +- Use pytest to run tests rather than nose that will break with + python 3.10 + +------------------------------------------------------------------- +Sun Mar 1 01:21:17 UTC 2020 - Mook + +- Fix Menu.py using attributes that no longer exist + Patch from https://gitlab.freedesktop.org/xdg/pyxdg/-/merge_requests/2 + * new-api.patch + ------------------------------------------------------------------- Sun Sep 15 06:48:50 UTC 2019 - John Vandenberg diff --git a/python-pyxdg.spec b/python-pyxdg.spec index d1d510d..7685467 100644 --- a/python-pyxdg.spec +++ b/python-pyxdg.spec @@ -1,7 +1,7 @@ # # spec file for package python-pyxdg # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,11 +23,12 @@ Version: 0.26 Release: 0 Summary: Implementations of freedesktop.org standards in python License: LGPL-2.1-only -Group: Development/Languages/Python -URL: http://freedesktop.org/wiki/Software/pyxdg +URL: https://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} +Patch1: https://gitlab.freedesktop.org/tcallawa/pyxdg/-/commit/b8d3d7b337adeb2fc2ef8a36f3a500e147d7a41b.diff#/new-api.patch +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: hicolor-icon-theme BuildRequires: python-rpm-macros @@ -55,20 +56,21 @@ PyXDG is a python library to access freedesktop.org standards. Currently support %prep %setup -q -n pyxdg-%{version} %patch0 -p1 +%patch1 -p1 %build %python_build %install %python_install -%python_expand %fdupes %{buildroot}%{python_sitelib} +%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 # 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* +PYTHONPATH=%{buildroot}%{$python_sitelib} pytest-%{$python_bin_suffix} test/test-*.py -v -k 'not test_get_type' } %files %{python_files}