python/python-Sphinx
SHA256
14
0
Fork 0
forked from pool/python-Sphinx
Code Pull Requests Activity

Accepting request 845960 from home:bnavigator:branches:devel:languages:python

Browse Source 
- Fix the lang collection macro override.
  * gh#openSUSE/python-rpm-macros#66
  * gh#openSUSE/python-rpm-macros#74

OBS-URL: https://build.opensuse.org/request/show/845960
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=165
This commit is contained in:
Matej Cepl
2020-11-04 19:50:22 +00:00
committed by Git OBS Bridge
parent 5cc3e1edce
commit 1fe482d81c
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python-Sphinx.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
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> Tue Nov 3 19:56:15 UTC 2020 - Benjamin Greiner <code@bnavigator.de>

14
python-Sphinx.spec
View File

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