From 5cc3e1edce59d417038476d8ef3c710973496a2d19b0267dc27a144575129878 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Tue, 3 Nov 2020 20:55:53 +0000 Subject: [PATCH] Accepting request 845821 from home:bnavigator:branches:devel:languages:python - Fix lang files collection for multiple flavors * gh#openSUSE/python-rpm-macros#5 * gh#openSUSE/python-rpm-macros#66 OBS-URL: https://build.opensuse.org/request/show/845821 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=164 --- python-Sphinx.changes | 7 +++++++ python-Sphinx.spec | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/python-Sphinx.changes b/python-Sphinx.changes index d38b9a2..77cfe1d 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 3 19:56:15 UTC 2020 - Benjamin Greiner + +- Fix lang files collection for multiple flavors + * gh#openSUSE/python-rpm-macros#5 + * gh#openSUSE/python-rpm-macros#66 + ------------------------------------------------------------------- Mon Sep 28 13:45:37 UTC 2020 - Dirk Mueller diff --git a/python-Sphinx.spec b/python-Sphinx.spec index d9bb227..c16d02f 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -251,7 +251,12 @@ mv build/sphinx/{html,man} build.doc/ %python_expand mkdir -p %{buildroot}%{$python_sitelib}/sphinxcontrib %python_expand %fdupes %{buildroot}%{$python_sitelib} -%find_lang sphinx +%{?python_find_lang sphinx}%{?!python_find_lang:%find_lang sphinx +%{python_expand langfile=sphinx.lang +grep -v 'python.*site-packages' ${langfile} > %{$python_prefix}-${langfile} +grep -F %{$python_sitelib} ${langfile} >> %{$python_prefix}-${langfile} +} +} %else mkdir -p %{buildroot}%{_docdir}/python-Sphinx/ @@ -282,7 +287,7 @@ export LC_ALL="C.utf8" %endif %if ! %{with test} -%files %{python_files} -f sphinx.lang +%files %{python_files} -f %{python_prefix}-sphinx.lang %license LICENSE %doc AUTHORS CHANGES README.rst %python_alternative %{_bindir}/sphinx-apidoc