Accepting request 1164112 from devel:languages:python

OBS-URL: https://build.opensuse.org/request/show/1164112
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-docutils?expand=0&rev=40

python-docutils.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Mar 30 15:15:42 UTC 2024 - Ben Greiner <code@bnavigator.de>
+
+- Fix update-alternatives updates: docutils is the master but
+  rst2html from old installations can create update failures
+- Fix bytecode cache errors: Don't modify python scripts after
+  install
+
 -------------------------------------------------------------------
 Fri Feb 23 11:02:30 UTC 2024 - Dan Čermák <dcermak@suse.com>
 
@@ -8,8 +16,8 @@ Fri Nov 10 02:31:29 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
 
 - Update to 0.20.1:
   * Include tox.ini and docutils.conf in the source package
-  * Docutils 0.20 is the last version supporting Python 3.7 and 3.8.
+  * Docutils 0.20 is the last version supporting Python 3.7 and 3.8.
-  * Support Python 3.11 (patch #198 by Hugo van Kemenade).
+  * Support Python 3.11 (patch #198 by Hugo van Kemenade).
   * New functions `rst2…()` for use as "console_scripts" `entry points`_.
   * Fix `previous_sibling()` method that led to invalid HTML in some cases
   * Fix bug #463. Spurious comma in deprecation warning.

python-docutils.spec

@@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package python-docutils
 #
 # Copyright (c) 2024 SUSE LLC
 #
@@ -38,8 +38,9 @@ BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+Requires(pre):  update-alternatives
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 Recommends:     python-Pillow
 Recommends:     python-Pygments
 Recommends:     python-roman
@@ -69,7 +70,20 @@ sed -i "s|'tools/\(rst.*\)\.py'|'tools/\1'|" setup.py
 find . -name \*.mp4 -print -exec chmod -x '{}' \;
 
 # Actually seems to work with Python 3.6
-sed -i -e '/python_requires/s/7/6/' setup.py
+sed -i -e '/python_requires/ s/7/6/' setup.py
+
+# Remove shebang from non-executable files
+sed -i '1{/^#!/d}' \
+  docutils/__main__.py \
+  docutils/parsers/commonmark_wrapper.py \
+  docutils/parsers/recommonmark_wrapper.py \
+  docutils/utils/error_reporting.py \
+  docutils/utils/math/math2html.py \
+  docutils/utils/math/tex2unichar.py \
+  docutils/utils/smartquotes.py \
+  docutils/writers/_html_base.py \
+  docutils/writers/odf_odt/prepstyles.py \
+  docutils/writers/xetex/__init__.py
 
 %build
 %pyproject_wheel
@@ -80,17 +94,7 @@ sed -i -e '/python_requires/s/7/6/' setup.py
 for binary in docutils rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html rst2html4 rst2html5 ; do
     %python_clone -a %{buildroot}%{_bindir}/$binary
 done
-%{python_expand %fdupes %{buildroot}%{$python_sitelib}
+%python_expand %fdupes %{buildroot}%{$python_sitelib}
-
-# Remove shebang from non-executable files
-for i in code_analyzer error_reporting punctuation_chars smartquotes math/latex2mathml math/math2html math/tex2mathml_extern ; do
-    sed -i -e '1{\@^#! *%{_bindir}.*python@d}' %{buildroot}%{$python_sitelib}/docutils/utils/$i.py
-done
-for i in writers/xetex/__init__ writers/_html_base __main__ parsers/commonmark_wrapper parsers/recommonmark_wrapper ; do
-    sed -i -e '1{\@^#! *%{_bindir}.*python@d}' %{buildroot}%{$python_sitelib}/docutils/$i.py
-done
-}
-
 %endif
 
 %check
@@ -99,14 +103,16 @@ done
 %endif
 
 %if !%{with test}
+# sometime ago rst2html was the master which would let fail the upgrade with master docutils in post below
+%pre
+update-alternatives --query rst2html >/dev/null 2>&1 && update-alternatives --quiet --remove-all rst2html ||:
+
 %post
-%{python_install_alternative docutils rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html rst2html4 rst2html5}
+%python_install_alternative docutils rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html rst2html4 rst2html5
 
 %postun
-%{python_uninstall_alternative docutils rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html rst2html4 rst2html5}
+%python_uninstall_alternative docutils
-%endif
 
-%if !%{with test}
 %files %{python_files}
 %license COPYING.txt licenses/*.txt
 %doc FAQ.txt HISTORY.txt README.txt THANKS.txt BUGS.txt docs/*