Fix line encoding of bundled jquery.js

- Mark license file with %license instead of %doc

.gitignore

@@ -1 +1 @@
-/Sphinx-1.1.3.tar.gz
+/Sphinx-1.2.3.tar.gz

Sphinx-1.1.3-fix_quoting_in_inheritance.patch

@@ -1,13 +0,0 @@
---- Sphinx-1.1.3/sphinx/ext/inheritance_diagram.py.orig	2012-02-19 11:54:47.000000000 +0100
-+++ Sphinx-1.1.3/sphinx/ext/inheritance_diagram.py	2013-03-02 18:44:29.303047600 +0100
-@@ -199,8 +199,8 @@ class InheritanceGraph(object):
-         'shape': 'box',
-         'fontsize': 10,
-         'height': 0.25,
--        'fontname': 'Vera Sans, DejaVu Sans, Liberation Sans, '
--                    'Arial, Helvetica, sans',
-+        'fontname': '"Vera Sans, DejaVu Sans, Liberation Sans, '
-+                    'Arial, Helvetica, sans"',
-         'style': '"setlinewidth(0.5)"',
-     }
-     default_edge_attrs = {

Sphinx-1.2.1-mantarget.patch

@@ -0,0 +1,15 @@
+--- sphinx/doc/Makefile.mantarget	2014-02-13 23:28:58.604797750 +0700
++++ sphinx/doc/Makefile	2014-02-14 00:00:45.794658764 +0700
+@@ -12,6 +12,12 @@
+ help:
+ 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+ 
++# Likewise for man, since a man directory exist and make will assume
++# the target is up to date
++.PHONY: man
++man:
++	@$(SPHINXBUILD) -M man "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
++
+ # Catch-all target: route all unknown targets to Sphinx using the new
+ # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+ %:

Sphinx-1.2.2-verbosetests.patch

@@ -0,0 +1,8 @@
+--- Sphinx-1.2.2/tests/run.py.verbosetests	2014-03-02 14:38:09.000000000 +0700
++++ Sphinx-1.2.2/tests/run.py	2015-02-05 18:40:47.641374670 +0700
+@@ -58,4 +58,4 @@
+     sys.exit(1)
+ 
+ print('Running Sphinx test suite...')
+-nose.main()
++nose.main(argv=['nose', '--verbosity=3'])

python-sphinx.spec

@@ -8,8 +8,8 @@
 %global upstream_name Sphinx
 
 Name:       python-sphinx
-Version:    1.1.3
-Release:    7%{?dist}
+Version:    1.2.3
+Release:    3%{?dist}
 Summary:    Python documentation generator
 
 Group:      Development/Tools
@@ -21,21 +21,41 @@ Group:      Development/Tools
 License:    BSD and Public Domain and Python and (MIT or GPLv2)
 URL:        http://sphinx.pocoo.org/
 Source0:    http://pypi.python.org/packages/source/S/%{upstream_name}/%{upstream_name}-%{version}.tar.gz
-# Sent upstream as a fix to work with the next version of docutils
-# https://bitbucket.org/birkenfeld/sphinx/issue/998/docutils-010-will-break-sphinx-manpage
-Patch0: sphinx-docutils-0.10.patch
-# Fixes quoting issue in inheritance_diagram.py
-# Already applied upstream as part of https://bitbucket.org/birkenfeld/sphinx/commits/fc1db93d21a5a535d9d62e5a0c9f0a806a8c117a
-Patch1: Sphinx-1.1.3-fix_quoting_in_inheritance.patch
+Patch0:     Sphinx-1.2.1-mantarget.patch
+Patch1:     Sphinx-1.2.2-verbosetests.patch
 
 BuildArch:     noarch
 BuildRequires: python2-devel >= 2.4
 BuildRequires: python-setuptools
 BuildRequires: python-docutils
 BuildRequires: python-jinja2
+BuildRequires: python-pygments
+
+# for fixes
+BuildRequires: dos2unix
+
+# for testing
 BuildRequires: python-nose
-# Test dependencies
-BuildRequires: texlive-latex
+BuildRequires: gettext
+BuildRequires: texinfo
+BuildRequires: python-sqlalchemy
+BuildRequires: python-whoosh
+# note: no Python3 xapian binding yet
+BuildRequires: xapian-bindings-python
+BuildRequires: texlive-collection-fontsrecommended
+BuildRequires: texlive-collection-latex
+BuildRequires: tex(cmap.sty)
+BuildRequires: tex(ecrm1000.tfm)
+BuildRequires: tex(fancybox.sty)
+BuildRequires: tex(footnote.sty)
+BuildRequires: tex(framed.sty)
+BuildRequires: tex(multirow.sty)
+BuildRequires: tex(parskip.sty)
+BuildRequires: tex(titlesec.sty)
+BuildRequires: tex(threeparttable.sty)
+BuildRequires: tex(upquote.sty)
+BuildRequires: tex(wrapfig.sty)
+
 
 %if 0%{?with_python3}
 BuildRequires: python3-devel
@@ -44,6 +64,8 @@ BuildRequires: python3-docutils
 BuildRequires: python3-jinja2
 BuildRequires: python3-pygments
 BuildRequires: python3-nose
+BuildRequires: python3-sqlalchemy
+BuildRequires: python3-whoosh
 %endif # with_python3
 
 Requires:      python-docutils
@@ -79,10 +101,39 @@ the Python docs:
       snippets and inclusion of appropriately formatted docstrings.
 
 
+%package latex
+Summary:       LaTeX builder dependencies for %{name}
+Requires:      %{name} = %{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)
+
+%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 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 pulls in the TeX dependencies needed by Sphinx's LaTeX
+builder.
+
+
 %if 0%{?with_python3}
 %package -n python3-sphinx
-Summary:    Python documentation generator
-Group:      Development/Tools
+Summary:       Python documentation generator
+Group:         Development/Tools
 Requires:      python3-docutils
 Requires:      python3-jinja2
 Requires:      python3-pygments
@@ -114,6 +165,34 @@ the Python docs:
     * Code handling: automatic highlighting using the Pygments highlighter
     * Various extensions are available, e.g. for automatic testing of
       snippets and inclusion of appropriately formatted docstrings.
+
+%package -n python3-sphinx-latex
+Summary:       LaTeX builder dependencies for %{name}
+Requires:      python3-sphinx = %{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)
+
+%description -n python3-sphinx-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 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 pulls in the TeX dependencies needed by Sphinx's LaTeX
+builder.
 %endif # with_python3
 
 
@@ -123,7 +202,6 @@ Group:      Documentation
 License:    BSD
 Requires:   %{name} = %{version}-%{release}
 
-
 %description doc
 Sphinx is a tool that makes it easy to create intelligent and
 beautiful documentation for Python projects (or other documents
@@ -137,10 +215,14 @@ This package contains documentation in reST and HTML formats.
 
 %prep
 %setup -q -n %{upstream_name}-%{version}%{?prerel}
+%patch0 -p1 -b .mantarget
+# not backing up since every executable file in tests/ results in
+# an additional "skipped" test
+%patch1 -p1
 sed '1d' -i sphinx/pycode/pgen2/token.py
 
-%patch0 -p1
-%patch1 -p1
+# fix line encoding of bundled jquery.js
+dos2unix -k ./sphinx/themes/basic/static/jquery.js
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -176,6 +258,7 @@ pushd %{py3dir}
 for f in %{buildroot}%{_bindir}/sphinx-*;
 do
     mv $f $f-%{python3_version}
+    ln -s %{_bindir}/`basename $f-%{python3_version}` $f-3
 done
 popd
 %endif # with_python3
@@ -191,6 +274,10 @@ for f in %{buildroot}%{_mandir}/man1/sphinx-*.1;
 do
     cp -p $f $(echo $f | sed -e "s|.1$|-%{python3_version}.1|")
 done
+
+# Remove language files, they're identical to the ones from the
+# Python 2 build that will be moved to /usr/share below
+find %{buildroot}%{python3_sitelib}/sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -exec rm -rf '{}' \;
 %endif # with_python3
 popd
 
@@ -203,7 +290,7 @@ mv doc reST
 # patch to support this incorporated in 0.6.6
 pushd %{buildroot}%{python_sitelib}
 
-for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -printf "%f "`;
+for lang in `find sphinx/locale -maxdepth 1 -mindepth 1 -type d -not -path '*/\.*' -printf "%f "`;
 do
   install -d %{buildroot}%{_datadir}/sphinx/locale/$lang
   install -d %{buildroot}%{_datadir}/locale/$lang/LC_MESSAGES
@@ -224,17 +311,18 @@ popd
 
 
 %check
-make test
+LANG=en_US.UTF-8 make test
 %if 0%{?with_python3}
 pushd %{py3dir}
-make test
+LANG=en_US.UTF-8 PYTHON=python3 make test
 popd
 %endif # with_python3
 
 
 %files -f sphinx.lang
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
+%license LICENSE
+%doc AUTHORS CHANGES EXAMPLES README.rst TODO
+%exclude %{_bindir}/sphinx-*-3
 %exclude %{_bindir}/sphinx-*-%{python3_version}
 %{_bindir}/sphinx-*
 %{python_sitelib}/*
@@ -244,23 +332,84 @@ popd
 %exclude %{_mandir}/man1/sphinx-*-%{python3_version}.1*
 %{_mandir}/man1/*
 
+%files latex
+%license LICENSE
+
 %if 0%{?with_python3}
-%files -n python3-sphinx
-%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO
+%files -n python3-sphinx -f sphinx.lang
+%license LICENSE
+%doc AUTHORS CHANGES EXAMPLES README.rst TODO
+%{_bindir}/sphinx-*-3
 %{_bindir}/sphinx-*-%{python3_version}
 %{python3_sitelib}/*
 %dir %{_datadir}/sphinx/
 %dir %{_datadir}/sphinx/locale
 %dir %{_datadir}/sphinx/locale/*
 %{_mandir}/man1/sphinx-*-%{python3_version}.1*
+
+%files -n python3-sphinx-latex
+%license LICENSE
 %endif # with_python3
 
 %files doc
-%defattr(-,root,root,-)
 %doc html reST
 
 
 %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
+
+* Thu Feb  5 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-10
+- Complete LaTeX builder deps (fixes bz#882166)
+- Make test output verbose
+- Add BRs needed to enable all tests
+
+* Tue Feb  3 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-9
+- python3-sphinx package also Provides: python3-sphinx-latex
+
+* Tue Feb  3 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-8
+- If a separate LaTeX subpackage is not generated, the main package should have
+  a virtual Provides: for it (bz#1187989)
+
+* Tue Jan 27 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-7
+- Disable separate LaTeX builder for now (bz#1185574)
+
+* Thu Jan 22 2015 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.2.2-6
+- Split off LaTeX builder into its own subpackages, to remove TeXLive
+  dependencies from the main package.
+  Thanks to Robert Kuska <rkuska@redhat.com> for feedback
+- Clean up python3-sphinx's locale files, they ended up in the python2 package.
+  Share the locale files in /usr/share instead
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue May 27 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.2.2-4
+- Don't own the -3 scripts by python 2 package
+
+* Thu May 22 2014 Bohuslav Kabrda <bkabrda@redhat.com> - 1.2.2-3
+- Add sphinx-*-3 links to scripts
+Resolves: #1098109
+
+* Fri May  9 2014 Orion Poplawski <orion@cora.nwra.com> - 1.2.2-2
+- Rebuild for Python 3.4
+
+* Fri May  9 2014 Orion Poplawski <orion@cora.nwra.com> - 1.2.2-1
+- Update to 1.2.2
+
+* Thu Feb 13 2014 Michel Salim <salimma@fedoraproject.org> - 1.2.1-1
+- Update to 1.2.1
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Sat Mar  9 2013 Michel Salim <salimma@fedoraproject.org> - 1.1.3-7
 - Fix inheritance_diagram quoting bug, exposed by the newer, stricter dot
 

sources

@@ -1 +1 @@
-8f55a6d4f87fc6d528120c5d1f983e98  Sphinx-1.1.3.tar.gz
+a98c93124035b4cd7183604aec656cb3  Sphinx-1.2.3.tar.gz

sphinx-docutils-0.10.patch

@@ -1,28 +0,0 @@
-diff -up Sphinx-1.1.3/sphinx/writers/manpage.py.bak Sphinx-1.1.3/sphinx/writers/manpage.py
---- Sphinx-1.1.3/sphinx/writers/manpage.py.bak	2011-11-01 00:38:44.000000000 -0700
-+++ Sphinx-1.1.3/sphinx/writers/manpage.py	2012-08-21 12:38:33.380808202 -0700
-@@ -72,6 +72,11 @@ class ManualPageTranslator(BaseTranslato
-         # since self.append_header() is never called, need to do this here
-         self.body.append(MACRO_DEF)
- 
-+        # Overwrite admonition label translations with our own
-+        for label, translation in admonitionlabels.items():
-+            self.language.labels[label] = self.deunicode(translation)
-+
-+
-     # overwritten -- added quotes around all .TH arguments
-     def header(self):
-         tmpl = (".TH \"%(title_upper)s\" \"%(manual_section)s\""
-@@ -193,12 +198,6 @@ class ManualPageTranslator(BaseTranslato
-     def depart_seealso(self, node):
-         self.depart_admonition(node)
- 
--    # overwritten -- use our own label translations
--    def visit_admonition(self, node, name=None):
--        if name:
--            self.body.append('.IP %s\n' %
--                             self.deunicode(admonitionlabels.get(name, name)))
--
-     def visit_productionlist(self, node):
-         self.ensure_eol()
-         names = []