From 81977912585cffba4fd5ffc58c4f8e70a742429137ffe5f39c63776c2892804d Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 9 Sep 2015 07:25:00 +0000 Subject: [PATCH 1/2] Accepting request 329816 from home:TheBlackCat:branches:devel:languages:python Split latex-related stuff into its own subpackage so we can depend on the necessary latex components. OBS-URL: https://build.opensuse.org/request/show/329816 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=62 --- python-Sphinx.changes | 6 ++ python-Sphinx.spec | 143 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 149 insertions(+) diff --git a/python-Sphinx.changes b/python-Sphinx.changes index 1b6ee0d..f99f98b 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 4 13:27:51 UTC 2015 - toddrme2178@gmail.com + +- Split latex-related stuff into its own subpackage so we can + depend on the necessary latex components. + ------------------------------------------------------------------- Wed Jul 29 13:18:28 UTC 2015 - hpj@urpla.net diff --git a/python-Sphinx.spec b/python-Sphinx.spec index dd6f8ee..0a0e7af 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -39,6 +39,64 @@ BuildRequires: python-sphinx_rtd_theme # Testsuite requirements: BuildRequires: python-Pygments >= 1.2 BuildRequires: python-nose +# LaTeX requirements, not available on SLES +%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} > 1110 ) +BuildRequires: texlive-latex +BuildRequires: texlive-metafont +BuildRequires: texlive-pdftex +BuildRequires: tex(article.cls) +BuildRequires: tex(pdftex.def) +BuildRequires: tex(utf8.def) +BuildRequires: tex(utf8x.def) +BuildRequires: tex(8r.enc) +BuildRequires: tex(english.ldf) +BuildRequires: tex(pdftex.map) +BuildRequires: tex(alltt.sty) +BuildRequires: tex(amsfonts.sty) +BuildRequires: tex(amsmath.sty) +BuildRequires: tex(amssymb.sty) +BuildRequires: tex(amsthm.sty) +BuildRequires: tex(array.sty) +BuildRequires: tex(atbegshi.sty) +BuildRequires: tex(babel.sty) +BuildRequires: tex(bm.sty) +BuildRequires: tex(cmap.sty) +BuildRequires: tex(color.sty) +BuildRequires: tex(colortbl.sty) +BuildRequires: tex(dvipdfmx.def) +BuildRequires: tex(fancybox.sty) +BuildRequires: tex(fancyhdr.sty) +BuildRequires: tex(fancyvrb.sty) +BuildRequires: tex(float.sty) +BuildRequires: tex(fncychap.sty) +BuildRequires: tex(fontenc.sty) +BuildRequires: tex(footnote.sty) +BuildRequires: tex(framed.sty) +BuildRequires: tex(graphics.sty) +BuildRequires: tex(graphicx.sty) +BuildRequires: tex(hypcap.sty) +BuildRequires: tex(hyperref.sty) +BuildRequires: tex(ifthen.sty) +BuildRequires: tex(inputenc.sty) +BuildRequires: tex(longtable.sty) +BuildRequires: tex(makeidx.sty) +BuildRequires: tex(multirow.sty) +BuildRequires: tex(palatino.sty) +BuildRequires: tex(parskip.sty) +BuildRequires: tex(preview.sty) +BuildRequires: tex(tabulary.sty) +BuildRequires: tex(textcomp.sty) +BuildRequires: tex(threeparttable.sty) +BuildRequires: tex(times.sty) +BuildRequires: tex(titlesec.sty) +BuildRequires: tex(upquote.sty) +BuildRequires: tex(wrapfig.sty) +BuildRequires: tex(pcrr.tfm) +BuildRequires: tex(phvr.tfm) +BuildRequires: tex(pplr.tfm) +BuildRequires: tex(ptmr.tfm) +BuildRequires: tex(pzcmi.tfm) +%endif Requires(post): update-alternatives Requires(postun): update-alternatives Requires: python-Babel @@ -49,6 +107,7 @@ Requires: python-docutils >= 0.11 Requires: python-six >= 1.4 Requires: python-snowballstemmer Requires: python-sphinx_rtd_theme + %if 0%{?suse_version} Recommends: python-rst2pdf %endif @@ -92,6 +151,79 @@ 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 latex +Summary: Sphinx packages for LaTeX +Group: Productivity/Publishing/TeX/Base +Requires: texlive-latex +Requires: texlive-metafont +Requires: texlive-pdftex +Requires: tex(article.cls) +Requires: tex(pdftex.def) +Requires: tex(utf8.def) +Requires: tex(utf8x.def) +Requires: tex(8r.enc) +Requires: tex(english.ldf) +Requires: tex(pdftex.map) +Requires: tex(alltt.sty) +Requires: tex(amsfonts.sty) +Requires: tex(amsmath.sty) +Requires: tex(amssymb.sty) +Requires: tex(amsthm.sty) +Requires: tex(array.sty) +Requires: tex(atbegshi.sty) +Requires: tex(babel.sty) +Requires: tex(bm.sty) +Requires: tex(cmap.sty) +Requires: tex(color.sty) +Requires: tex(colortbl.sty) +Requires: tex(dvipdfmx.def) +Requires: tex(fancybox.sty) +Requires: tex(fancyhdr.sty) +Requires: tex(fancyvrb.sty) +Requires: tex(float.sty) +Requires: tex(fncychap.sty) +Requires: tex(fontenc.sty) +Requires: tex(footnote.sty) +Requires: tex(framed.sty) +Requires: tex(graphics.sty) +Requires: tex(graphicx.sty) +Requires: tex(hypcap.sty) +Requires: tex(hyperref.sty) +Requires: tex(ifthen.sty) +Requires: tex(inputenc.sty) +Requires: tex(longtable.sty) +Requires: tex(makeidx.sty) +Requires: tex(multirow.sty) +Requires: tex(palatino.sty) +Requires: tex(parskip.sty) +Requires: tex(preview.sty) +Requires: tex(tabulary.sty) +Requires: tex(textcomp.sty) +Requires: tex(threeparttable.sty) +Requires: tex(times.sty) +Requires: tex(titlesec.sty) +Requires: tex(upquote.sty) +Requires: tex(wrapfig.sty) +Requires: tex(pcrr.tfm) +Requires: tex(phvr.tfm) +Requires: tex(pplr.tfm) +Requires: tex(ptmr.tfm) +Requires: tex(pzcmi.tfm) + +%description latex +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 +for the new Python documentation, and has excellent facilities for Python +project documentation, but C/C++ is supported as well, and more languages are +planned. + +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. + +This package contains the LaTeX components for %{name}. + %prep %setup -q -n Sphinx-%{version} sed -i '/#\!/d' sphinx/pycode/pgen2/token.py # Fix non-excutable-script warning @@ -160,6 +292,9 @@ fi %{_mandir}/man1/sphinx-quickstart.1.gz %{_mandir}/man1/sphinx-quickstart-%{py_ver}.1.gz %{python_sitelib}/sphinx/ +%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} > 1110 ) +%exclude %{python_sitelib}/sphinx/texinputs/ +%endif %{python_sitelib}/Sphinx-%{version}-py%{py_ver}.egg-info %ghost %{_sysconfdir}/alternatives/sphinx-apidoc %ghost %{_sysconfdir}/alternatives/sphinx-autogen @@ -174,4 +309,12 @@ fi %defattr(-,root,root,-) %doc EXAMPLES build/sphinx/html +# Requirements are not available on SLES +%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} > 1110 ) +%files latex +%defattr(-,root,root,-) +%doc AUTHORS LICENSE +%{python_sitelib}/sphinx/texinputs/ +%endif + %changelog From caf947ac7ab83d8509e419c8972c7fdb6df13c688b4000f364cc2aa11c79582b Mon Sep 17 00:00:00 2001 From: Todd R Date: Wed, 16 Sep 2015 13:16:36 +0000 Subject: [PATCH 2/2] Accepting request 331498 from home:TheBlackCat:branches:devel:languages:python Don't buildrequires latex-related stuff. OBS-URL: https://build.opensuse.org/request/show/331498 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Sphinx?expand=0&rev=63 --- python-Sphinx.changes | 5 ++++ python-Sphinx.spec | 58 ------------------------------------------- 2 files changed, 5 insertions(+), 58 deletions(-) diff --git a/python-Sphinx.changes b/python-Sphinx.changes index f99f98b..22b146d 100644 --- a/python-Sphinx.changes +++ b/python-Sphinx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 16 13:16:01 UTC 2015 - toddrme2178@gmail.com + +- Don't buildrequires latex-related stuff. + ------------------------------------------------------------------- Fri Sep 4 13:27:51 UTC 2015 - toddrme2178@gmail.com diff --git a/python-Sphinx.spec b/python-Sphinx.spec index 0a0e7af..070142b 100644 --- a/python-Sphinx.spec +++ b/python-Sphinx.spec @@ -39,64 +39,6 @@ BuildRequires: python-sphinx_rtd_theme # Testsuite requirements: BuildRequires: python-Pygments >= 1.2 BuildRequires: python-nose -# LaTeX requirements, not available on SLES -%if 0%{?suse_version} && ( 0%{?suse_version} != 1315 && 0%{?suse_version} > 1110 ) -BuildRequires: texlive-latex -BuildRequires: texlive-metafont -BuildRequires: texlive-pdftex -BuildRequires: tex(article.cls) -BuildRequires: tex(pdftex.def) -BuildRequires: tex(utf8.def) -BuildRequires: tex(utf8x.def) -BuildRequires: tex(8r.enc) -BuildRequires: tex(english.ldf) -BuildRequires: tex(pdftex.map) -BuildRequires: tex(alltt.sty) -BuildRequires: tex(amsfonts.sty) -BuildRequires: tex(amsmath.sty) -BuildRequires: tex(amssymb.sty) -BuildRequires: tex(amsthm.sty) -BuildRequires: tex(array.sty) -BuildRequires: tex(atbegshi.sty) -BuildRequires: tex(babel.sty) -BuildRequires: tex(bm.sty) -BuildRequires: tex(cmap.sty) -BuildRequires: tex(color.sty) -BuildRequires: tex(colortbl.sty) -BuildRequires: tex(dvipdfmx.def) -BuildRequires: tex(fancybox.sty) -BuildRequires: tex(fancyhdr.sty) -BuildRequires: tex(fancyvrb.sty) -BuildRequires: tex(float.sty) -BuildRequires: tex(fncychap.sty) -BuildRequires: tex(fontenc.sty) -BuildRequires: tex(footnote.sty) -BuildRequires: tex(framed.sty) -BuildRequires: tex(graphics.sty) -BuildRequires: tex(graphicx.sty) -BuildRequires: tex(hypcap.sty) -BuildRequires: tex(hyperref.sty) -BuildRequires: tex(ifthen.sty) -BuildRequires: tex(inputenc.sty) -BuildRequires: tex(longtable.sty) -BuildRequires: tex(makeidx.sty) -BuildRequires: tex(multirow.sty) -BuildRequires: tex(palatino.sty) -BuildRequires: tex(parskip.sty) -BuildRequires: tex(preview.sty) -BuildRequires: tex(tabulary.sty) -BuildRequires: tex(textcomp.sty) -BuildRequires: tex(threeparttable.sty) -BuildRequires: tex(times.sty) -BuildRequires: tex(titlesec.sty) -BuildRequires: tex(upquote.sty) -BuildRequires: tex(wrapfig.sty) -BuildRequires: tex(pcrr.tfm) -BuildRequires: tex(phvr.tfm) -BuildRequires: tex(pplr.tfm) -BuildRequires: tex(ptmr.tfm) -BuildRequires: tex(pzcmi.tfm) -%endif Requires(post): update-alternatives Requires(postun): update-alternatives Requires: python-Babel