Fix line encoding of bundled jquery.js

python-sphinx.spec

@@ -5,15 +5,11 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
 %endif
 
-# more work needed; currently sphinx-build fails when
-# some latex files are unavailable - bz#1185574
-%bcond_with splitlatex
-
 %global upstream_name Sphinx
 
 Name:       python-sphinx
 Version:    1.2.3
-Release:    1%{?dist}
+Release:    3%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -35,6 +31,9 @@ BuildRequires: python-docutils
 BuildRequires: python-jinja2
 BuildRequires: python-pygments
 
+# for fixes
+BuildRequires: dos2unix
+
 # for testing
 BuildRequires: python-nose
 BuildRequires: gettext
@@ -72,22 +71,6 @@ BuildRequires: python3-whoosh
 Requires:      python-docutils
 Requires:      python-jinja2
 Requires:      python-pygments
-%if ! 0%{?with_splitlatex}
-Provides:      %{name}-latex = %{version}-%{release}
-Requires:      texlive-collection-fontsrecommended
-Requires:      texlive-collection-latex
-Requires:      tex(cmap.sty)
-Requires:      tex(ecrm1000.tfm)
-Requires:      tex(fancybox.sty)
-Requires:      tex(footnote.sty)
-Requires:      tex(framed.sty)
-Requires:      tex(multirow.sty)
-Requires:      tex(parskip.sty)
-Requires:      tex(titlesec.sty)
-Requires:      tex(threeparttable.sty)
-Requires:      tex(upquote.sty)
-Requires:      tex(wrapfig.sty)
-%endif
 
 %description
 Sphinx is a tool that makes it easy to create intelligent and
@@ -118,9 +101,8 @@ the Python docs:
       snippets and inclusion of appropriately formatted docstrings.
 
 
-%if 0%{?with_splitlatex}
 %package latex
-Summary:       LaTeX builder for %{name}
+Summary:       LaTeX builder dependencies for %{name}
 Requires:      %{name} = %{version}-%{release}
 Requires:      texlive-collection-fontsrecommended
 Requires:      texlive-collection-latex
@@ -144,10 +126,8 @@ Brandl. It was originally created to translate the new Python
 documentation, but has now been cleaned up in the hope that it will be
 useful to many other projects.
 
-This package contains the LaTeX builder for Sphinx. It is packaged
+This package pulls in the TeX dependencies needed by Sphinx's LaTeX
-separately so that the main package does not pull in TeXLive
+builder.
-dependencies.
-%endif
 
 
 %if 0%{?with_python3}
@@ -157,22 +137,6 @@ Group:         Development/Tools
 Requires:      python3-docutils
 Requires:      python3-jinja2
 Requires:      python3-pygments
-%if ! 0%{?with_splitlatex}
-Provides:      python3-sphinx-latex = %{version}-%{release}
-Requires:      texlive-collection-fontsrecommended
-Requires:      texlive-collection-latex
-Requires:      tex(cmap.sty)
-Requires:      tex(ecrm1000.tfm)
-Requires:      tex(fancybox.sty)
-Requires:      tex(footnote.sty)
-Requires:      tex(framed.sty)
-Requires:      tex(multirow.sty)
-Requires:      tex(parskip.sty)
-Requires:      tex(titlesec.sty)
-Requires:      tex(threeparttable.sty)
-Requires:      tex(upquote.sty)
-Requires:      tex(wrapfig.sty)
-%endif
 
 %description -n python3-sphinx
 Sphinx is a tool that makes it easy to create intelligent and
@@ -202,9 +166,8 @@ the Python docs:
     * Various extensions are available, e.g. for automatic testing of
       snippets and inclusion of appropriately formatted docstrings.
 
-%if 0%{?with_splitlatex}
 %package -n python3-sphinx-latex
-Summary:       LaTeX builder for %{name}
+Summary:       LaTeX builder dependencies for %{name}
 Requires:      python3-sphinx = %{version}-%{release}
 Requires:      texlive-collection-fontsrecommended
 Requires:      texlive-collection-latex
@@ -228,10 +191,8 @@ Brandl. It was originally created to translate the new Python
 documentation, but has now been cleaned up in the hope that it will be
 useful to many other projects.
 
-This package contains the LaTeX builder for Sphinx. It is packaged
+This package pulls in the TeX dependencies needed by Sphinx's LaTeX
-separately so that the main package does not pull in TeXLive
+builder.
-dependencies.
-%endif # with_splitlatex
 %endif # with_python3
 
 
@@ -260,6 +221,9 @@ This package contains documentation in reST and HTML formats.
 %patch1 -p1
 sed '1d' -i sphinx/pycode/pgen2/token.py
 
+# fix line encoding of bundled jquery.js
+dos2unix -k ./sphinx/themes/basic/static/jquery.js
+
 %if 0%{?with_python3}
 rm -rf %{py3dir}
 cp -a . %{py3dir}
@@ -361,11 +325,6 @@ popd
 %exclude %{_bindir}/sphinx-*-3
 %exclude %{_bindir}/sphinx-*-%{python3_version}
 %{_bindir}/sphinx-*
-%if 0%{?with_splitlatex}
-%exclude %{python_sitelib}/sphinx/builders/latex.py*
-%exclude %{python_sitelib}/sphinx/writers/latex.py*
-%exclude %{python_sitelib}/sphinx/texinputs
-%endif
 %{python_sitelib}/*
 %dir %{_datadir}/sphinx/
 %dir %{_datadir}/sphinx/locale
@@ -373,12 +332,8 @@ popd
 %exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1*
 %{_mandir}/man1/*
 
-%if 0%{?with_splitlatex}
 %files latex
-%{python_sitelib}/sphinx/builders/latex.py*
+%license LICENSE
-%{python_sitelib}/sphinx/writers/latex.py*
-%{python_sitelib}/sphinx/texinputs
-%endif
 
 %if 0%{?with_python3}
 %files -n python3-sphinx -f sphinx.lang
@@ -386,27 +341,14 @@ popd
 %doc AUTHORS CHANGES EXAMPLES README.rst TODO
 %{_bindir}/sphinx-*-3
 %{_bindir}/sphinx-*-%{python3_version}
-%if 0%{?with_splitlatex}
-%exclude %{python3_sitelib}/sphinx/builders/latex.py*
-%exclude %{python3_sitelib}/sphinx/builders/__pycache__/latex.*.py*
-%exclude %{python3_sitelib}/sphinx/writers/latex.py*
-%exclude %{python3_sitelib}/sphinx/writers/__pycache__/latex.*.py*
-%exclude %{python3_sitelib}/sphinx/texinputs
-%endif
 %{python3_sitelib}/*
 %dir %{_datadir}/sphinx/
 %dir %{_datadir}/sphinx/locale
 %dir %{_datadir}/sphinx/locale/*
 %{_mandir}/man1/sphinx-*-%{python3_version}.1*
 
-%if 0%{?with_splitlatex}
 %files -n python3-sphinx-latex
-%{python3_sitelib}/sphinx/builders/latex.py*
+%license LICENSE
-%{python3_sitelib}/sphinx/builders/__pycache__/latex.*.py*
-%{python3_sitelib}/sphinx/writers/latex.py*
-%{python3_sitelib}/sphinx/writers/__pycache__/latex.*.py*
-%{python3_sitelib}/sphinx/texinputs
-%endif # with_splitlatex
 %endif # with_python3
 
 %files doc
@@ -414,6 +356,12 @@ popd
 
 
 %changelog
+* Mon Jul 20 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.3-3
+- Fix line encoding of bundled jquery.js
+
+* Mon Jul 20 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.3-2
+- Re-introduce LaTeX subpackage, solely for pulling in LaTeX dependencies
+
 * Thu Feb  5 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.3-1
 - Update to 1.2.3
 - Mark license file with %%license instead of %%doc