Accepting request 846078 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/846078
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-Sphinx?expand=0&rev=69
This commit is contained in:
Dominique Leuenberger 2020-11-06 22:43:21 +00:00 committed by Git OBS Bridge
commit 088910de7e
2 changed files with 25 additions and 2 deletions

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Wed Nov 4 11:10:14 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
- Fix the lang collection macro override.
* gh#openSUSE/python-rpm-macros#66
* gh#openSUSE/python-rpm-macros#74
-------------------------------------------------------------------
Tue Nov 3 19:56:15 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
- 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 <dmueller@suse.com>

View File

@ -251,7 +251,16 @@ mv build/sphinx/{html,man} build.doc/
%python_expand mkdir -p %{buildroot}%{$python_sitelib}/sphinxcontrib
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%find_lang sphinx
# gh#openSUSE/python-rpm-macros#74
%{!?python_find_lang: %define python_find_lang() \
%find_lang %{**} \
langfile=%{?2}%{!?2:%1.lang} \
%{python_expand # \
grep -v 'python.*site-packages' ${langfile} > %{$python_prefix}-${langfile} \
grep -F %{$python_sitelib} ${langfile} >> %{$python_prefix}-${langfile} \
} \
}
%python_find_lang sphinx
%else
mkdir -p %{buildroot}%{_docdir}/python-Sphinx/
@ -282,7 +291,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