From 1fe482d81c589a5e965d79459d116e8b60a2d96c10f5c6b270fc321f0d22ed17 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Wed, 4 Nov 2020 19:50:22 +0000
Subject: [PATCH] Accepting request 845960 from
 home:bnavigator:branches:devel:languages:python

- 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
---
 python-Sphinx.changes |  7 +++++++
 python-Sphinx.spec    | 14 +++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/python-Sphinx.changes b/python-Sphinx.changes
index 77cfe1d..4b4b833 100644
--- a/python-Sphinx.changes
+++ b/python-Sphinx.changes
@@ -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>
 
diff --git a/python-Sphinx.spec b/python-Sphinx.spec
index c16d02f..f339546 100644
--- a/python-Sphinx.spec
+++ b/python-Sphinx.spec
@@ -251,12 +251,16 @@ mv build/sphinx/{html,man} build.doc/
 %python_expand mkdir -p %{buildroot}%{$python_sitelib}/sphinxcontrib
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
-%{?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}
-} 
+# 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/