Accepting request 913777 from home:fusionfuture:branches:devel:languages:python:Factory

- Renamed patch for assigned CVE:
  * bpo43075-fix-ReDoS-in-request.patch -> CVE-2021-3733-fix-ReDoS-in-request.patch
    (boo#1189287, CVE-2021-3733)
- Fix python-doc build (bpo#35293):
  * sphinx-update-removed-function.patch
- Update documentation formatting for Sphinx 3.0 (bpo#40204).

OBS-URL: https://build.opensuse.org/request/show/913777
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=298

python-doc.spec

@@ -107,13 +107,15 @@ Patch61:        CVE-2021-3177-buf_ovrfl_PyCArg_repr.patch
 Patch62:        CVE-2021-23336-only-amp-as-query-sep.patch
 # PATCH-FIX-UPSTREAM bpo44022-fix-http-client-infinite-line-reading-after-a-HTTP-100-Continue.patch boo#1189241 gh#python/cpython#25916
 Patch63:        bpo44022-fix-http-client-infinite-line-reading-after-a-HTTP-100-Continue.patch
-# PATCH-FIX-UPSTREAM bpo43075-fix-ReDoS-in-request.patch boo#1189287 gh#python/cpython#24391
-Patch64:        bpo43075-fix-ReDoS-in-request.patch
+# PATCH-FIX-UPSTREAM CVE-2021-3733-fix-ReDoS-in-request.patch boo#1189287 gh#python/cpython#24391
+Patch64:        CVE-2021-3733-fix-ReDoS-in-request.patch
+# PATCH-FIX-UPSTREAM sphinx-update-removed-function.patch bpo#35293 gh#python/cpython#22198 -- fix doc build
+Patch65:        sphinx-update-removed-function.patch
 # COMMON-PATCH-END
-Provides:       pyth_doc
-Provides:       pyth_ps
-Obsoletes:      pyth_doc
-Obsoletes:      pyth_ps
+Provides:       pyth_doc = %{version}
+Provides:       pyth_ps = %{version}
+Obsoletes:      pyth_doc < %{version}
+Obsoletes:      pyth_ps < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 Enhances:       python = %{version}
@@ -127,8 +129,8 @@ Python, and Macintosh Module Reference in HTML format.
 %package pdf
 Summary:        Python PDF Documentation
 Group:          Development/Languages/Python
-Provides:       pyth_pdf
-Obsoletes:      pyth_pdf
+Provides:       pyth_pdf = %{version}
+Obsoletes:      pyth_pdf < %{version}
 Provides:       python2-doc-pdf = %{version}
 
 %description pdf
@@ -180,9 +182,16 @@ Python, and Macintosh Module Reference in PDF format.
 %patch62 -p1
 %patch63 -p1
 %patch64 -p1
+%patch65 -p1
 
 # drop Autoconf version requirement
 sed -i 's/^version_required/dnl version_required/' configure.ac
+
+# Update documentation formatting for Sphinx 3.0 (bpo#40204)
+for i in `find Doc/ -type f -name "*.rst"`
+do
+  sed -i 's/:c:type:/:c:expr:/g' $i
+done
 # COMMON-PREP-END
 
 %build