From 04dd5168d33345720c4c2393e6cb6b7769a8691d61a385b4df177c4d840c5bd9 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 8 May 2017 15:39:30 +0000 Subject: [PATCH] Accepting request 493488 from home:TheBlackCat:branches:devel:languages:python - Fix update-alternatives. OBS-URL: https://build.opensuse.org/request/show/493488 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=79 --- python-Sphinx.changes | 5 +++ python-Sphinx.spec | 72 ++++++++++++++++++++++--------------------- 2 files changed, 42 insertions(+), 35 deletions(-) diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 032ab03..30721e5 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 8 15:38:53 UTC 2017 - toddrme2178@gmail.com + +- Fix update-alternatives. + ------------------------------------------------------------------- Fri May 5 14:55:31 UTC 2017 - toddrme2178@gmail.com diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 122db09..85adb76 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -16,6 +16,12 @@ # +%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} > 1110 ) +%bcond_without latex +%else +%bcond_with latex +%endif + %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define oldpython python Name: python-Sphinx @@ -50,8 +56,6 @@ BuildRequires: %{python_module pytest} # ENDSECTION # for python 2 only: BuildRequires: python-enum34 -Requires(post): update-alternatives -Requires(postun): update-alternatives Requires: python-Babel >= 1.3 Requires: python-Jinja2 >= 2.3 Requires: python-Pygments >= 2.0 @@ -62,6 +66,8 @@ Requires: python-requests >= 2.4 Requires: python-six >= 1.5 Requires: python-snowballstemmer >= 1.1 Requires: python-sphinx_rtd_theme +Requires(post): update-alternatives +Requires(postun): update-alternatives %if 0%{?suse_version} Recommends: python-rst2pdf @@ -89,13 +95,12 @@ Sphinx uses reStructuredText as its markup language, and many of its strengths come from the power and straightforwardness of reStructuredText and its parsing and translating suite, the Docutils. -%package -n python-Sphinx-doc +%package -n %{name}-doc Summary: Documentation for %{name} Group: Documentation/Other -Provides: python2-Sphinx-doc -Provides: python3-Sphinx-doc +Provides: %{python_module Sphinx-doc = %{version}} -%description -n python-Sphinx-doc +%description -n %{name}-doc Sphinx is a tool that makes it easy to create intelligent and beautiful documentation for Python projects (or other documents consisting of multiple reStructuredText sources), written by Georg Brandl. It was originally created @@ -204,23 +209,26 @@ mkdir build.doc mv build/sphinx/{html,man} build.doc %install -%{python_expand %$python_install -for B in apidoc autogen build quickstart ; do - mv %{buildroot}%{_bindir}/sphinx-$B{,-%$python_bin_suffix} -done } +%python_install install -d %{buildroot}%{_mandir}/man1/ -for B in apidoc autogen build quickstart ; do - %prepare_alternative sphinx-$B -done +mv build.doc/man/sphinx-all.1 %{buildroot}%{_mandir}/man1/sphinx-all.1 +mv build.doc/man/sphinx-apidoc.1 %{buildroot}%{_mandir}/man1/sphinx-apidoc.1 +mv build.doc/man/sphinx-build.1 %{buildroot}%{_mandir}/man1/sphinx-build.1 +mv build.doc/man/sphinx-quickstart.1 %{buildroot}%{_mandir}/man1/sphinx-quickstart.1 -for M in all apidoc build quickstart ; do - %{python_expand install -m 644 build.doc/man/sphinx-$M.1 %{buildroot}%{_mandir}/man1/sphinx-$M-%{$python_bin_suffix}.1} - %prepare_alternative -t %{_mandir}/man1/sphinx-$M.1.gz sphinx-$M.1.gz -done +%python_clone -a %{buildroot}%{_bindir}/sphinx-apidoc +%python_clone -a %{buildroot}%{_bindir}/sphinx-autogen +%python_clone -a %{buildroot}%{_bindir}/sphinx-build +%python_clone -a %{buildroot}%{_bindir}/sphinx-quickstart -%fdupes %{buildroot}%{_prefix} +%python_clone -a %{buildroot}%{_mandir}/man1/sphinx-all.1 +%python_clone -a %{buildroot}%{_mandir}/man1/sphinx-apidoc.1 +%python_clone -a %{buildroot}%{_mandir}/man1/sphinx-build.1 +%python_clone -a %{buildroot}%{_mandir}/man1/sphinx-quickstart.1 + +%python_expand %fdupes %{buildroot}%{$python_sitelib} %check export PYTHONPATH=$PWD @@ -230,14 +238,7 @@ export EXCLUDES="--ignore=test_build_linkcheck.py" %{python_expand make test PYTHON=%__$python TEST="$EXCLUDES"} %post -%{python_install_alternative sphinx-apidoc} \ - --slave %{_bindir}/sphinx-build sphinx-build %{_bindir}/sphinx-build-%{python_bin_suffix} \ - --slave %{_bindir}/sphinx-autogen sphinx-autogen %{_bindir}/sphinx-autogen-%{python_bin_suffix} \ - --slave %{_bindir}/sphinx-quickstart sphinx-quickstart %{_bindir}/sphinx-quickstart-%{python_bin_suffix} \ - --slave %{_mandir}/man1/sphinx-all.1.gz sphinx-all.1 %{_mandir}/man1/sphinx-all-%{python_bin_suffix}.1.gz \ - --slave %{_mandir}/man1/sphinx-apidoc.1.gz sphinx-apidoc.1 %{_mandir}/man1/sphinx-apidoc-%{python_bin_suffix}.1.gz \ - --slave %{_mandir}/man1/sphinx-build.1.gz sphinx-build.1 %{_mandir}/man1/sphinx-build-%{python_bin_suffix}.1.gz \ - --slave %{_mandir}/man1/sphinx-quickstart.1.gz sphinx-quickstart.1 %{_mandir}/man1/sphinx-quickstart-%{python_bin_suffix}.1.gz \ +%{python_install_alternative sphinx-apidoc sphinx-autogen sphinx-build sphinx-quickstart sphinx-all.1%ext_man sphinx-apidoc.1%ext_man sphinx-build.1%ext_man sphinx-quickstart.1%ext_man} %postun %python_uninstall_alternative sphinx-apidoc @@ -249,22 +250,23 @@ export EXCLUDES="--ignore=test_build_linkcheck.py" %python_alternative %{_bindir}/sphinx-autogen %python_alternative %{_bindir}/sphinx-build %python_alternative %{_bindir}/sphinx-quickstart -%python_alternative %{_mandir}/man1/sphinx-all.1.gz -%python_alternative %{_mandir}/man1/sphinx-apidoc.1.gz -%python_alternative %{_mandir}/man1/sphinx-build.1.gz -%python_alternative %{_mandir}/man1/sphinx-quickstart.1.gz +%python_alternative %{_mandir}/man1/sphinx-all.1%ext_man +%python_alternative %{_mandir}/man1/sphinx-apidoc.1%ext_man +%python_alternative %{_mandir}/man1/sphinx-build.1%ext_man +%python_alternative %{_mandir}/man1/sphinx-quickstart.1%ext_man %{python_sitelib}/sphinx/ -%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} > 1110 ) +%if %{with latex} %exclude %{python_sitelib}/sphinx/texinputs/ %endif -%{python_sitelib}/Sphinx-%{version}-py%{python_version}.egg-info +%{python_sitelib}/Sphinx-%{version}-py*.egg-info -%files -n python-Sphinx-doc +%files -n %{name}-doc %defattr(-,root,root,-) -%doc EXAMPLES build.doc/html +%doc AUTHORS LICENSE EXAMPLES +%doc build.doc/html/ # Requirements are not available on SLES -%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} > 1110 ) +%if %{with latex} %files %{python_files latex} %defattr(-,root,root,-) %doc AUTHORS LICENSE