From 168f5a41a2f29b40160a922c03e1ce1750970158a3f24c493001d16ceca21a29 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 6 Apr 2020 15:57:55 +0000 Subject: [PATCH] - Remove %python3_only and use full alternatives. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-docutils?expand=0&rev=64 --- python-docutils.changes | 5 ++++ python-docutils.spec | 61 ++++++++++++++--------------------------- 2 files changed, 26 insertions(+), 40 deletions(-) diff --git a/python-docutils.changes b/python-docutils.changes index fe9a81c..a3da64a 100644 --- a/python-docutils.changes +++ b/python-docutils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 6 15:57:17 UTC 2020 - Matej Cepl + +- Remove %python3_only and use full alternatives. + ------------------------------------------------------------------- Sat Mar 14 09:56:02 UTC 2020 - Tomáš Chvátal diff --git a/python-docutils.spec b/python-docutils.spec index 2daebae..c6b1908 100644 --- a/python-docutils.spec +++ b/python-docutils.spec @@ -80,57 +80,38 @@ sed -i -e "1d" "docutils/writers/xetex/__init__.py" "docutils/writers/_html_base %if !%{with test} %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} - -# To avoid conflicts with the rst2html4 package -mv %{buildroot}%{_bindir}/rst2html4 %{buildroot}%{_bindir}/rst2html4-docutils -ln -s -f %{_sysconfdir}/alternatives/rst2html4 %{buildroot}%{_bindir}/rst2html4 - -# To avoid conflicts with the rst2html5 package -mv %{buildroot}%{_bindir}/rst2html5 %{buildroot}%{_bindir}/rst2html5-docutils -ln -s -f %{_sysconfdir}/alternatives/rst2html5 %{buildroot}%{_bindir}/rst2html5 -%endif - -%ifpython3 -%post -update-alternatives --install %{_bindir}/rst2html4 rst2html4 %{_bindir}/rst2html4-docutils 15 -update-alternatives --install %{_bindir}/rst2html5 rst2html5 %{_bindir}/rst2html5-docutils 15 -%endif - -%ifpython3 -%postun -if [ ! -f %{_bindir}/rst2html4-docutils ] ; then - update-alternatives --remove rst2html4 %{_bindir}/rst2html4-docutils -fi -if [ ! -f %{_bindir}/rst2html5-docutils ] ; then - update-alternatives --remove rst2html5 %{_bindir}/rst2html5-docutils -fi +for binary in rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html rst2html4 rst2html5 ; do + %python_clone -a %{buildroot}%{_bindir}/$binary +done %endif %check %if %{with test} %python_exec test/alltests.py + +%post +%{python_install_alternative rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html rst2html4 rst2html5} + +%postun +%{python_uninstall_alternative rst2html rst2latex rst2man rst2odt rst2odt_prepstyles rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html rst2html4 rst2html5} %endif %if !%{with test} %files %{python_files} %license COPYING.txt licenses/*.txt %doc FAQ.txt HISTORY.txt README.txt THANKS.txt BUGS.txt docs/* -%python3_only %{_bindir}/rst2html -%python3_only %{_bindir}/rst2latex -%python3_only %{_bindir}/rst2man -%python3_only %{_bindir}/rst2odt -%python3_only %{_bindir}/rst2odt_prepstyles -%python3_only %{_bindir}/rst2pseudoxml -%python3_only %{_bindir}/rst2s5 -%python3_only %{_bindir}/rst2xetex -%python3_only %{_bindir}/rst2xml -%python3_only %{_bindir}/rstpep2html -%python3_only %{_bindir}/rst2html4 -%python3_only %{_bindir}/rst2html4-docutils -%python3_only %{_bindir}/rst2html5 -%python3_only %{_bindir}/rst2html5-docutils -%python3_only %ghost %{_sysconfdir}/alternatives/rst2html4 -%python3_only %ghost %{_sysconfdir}/alternatives/rst2html5 +%python_alternative %{_bindir}/rst2html +%python_alternative %{_bindir}/rst2latex +%python_alternative %{_bindir}/rst2man +%python_alternative %{_bindir}/rst2odt +%python_alternative %{_bindir}/rst2odt_prepstyles +%python_alternative %{_bindir}/rst2pseudoxml +%python_alternative %{_bindir}/rst2s5 +%python_alternative %{_bindir}/rst2xetex +%python_alternative %{_bindir}/rst2xml +%python_alternative %{_bindir}/rstpep2html +%python_alternative %{_bindir}/rst2html4 +%python_alternative %{_bindir}/rst2html5 %{python_sitelib}/docutils/ %{python_sitelib}/docutils-%{version}-py%{python_version}.egg-info %endif