From 5c3682d94b405d5ea5fecb7ce57db3857369f4e2 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Thu, 13 Feb 2014 23:33:41 +0700 Subject: [PATCH] Update to 1.2.1 --- Sphinx-1.1.3-fix_quoting_in_inheritance.patch | 13 ------ Sphinx-1.2.1-mantarget.patch | 15 +++++++ python-sphinx.spec | 40 +++++++++++-------- sources | 2 +- sphinx-docutils-0.10.patch | 28 ------------- 5 files changed, 39 insertions(+), 59 deletions(-) delete mode 100644 Sphinx-1.1.3-fix_quoting_in_inheritance.patch create mode 100644 Sphinx-1.2.1-mantarget.patch delete mode 100644 sphinx-docutils-0.10.patch diff --git a/Sphinx-1.1.3-fix_quoting_in_inheritance.patch b/Sphinx-1.1.3-fix_quoting_in_inheritance.patch deleted file mode 100644 index f9669f5..0000000 --- a/Sphinx-1.1.3-fix_quoting_in_inheritance.patch +++ /dev/null @@ -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 = { diff --git a/Sphinx-1.2.1-mantarget.patch b/Sphinx-1.2.1-mantarget.patch new file mode 100644 index 0000000..ad65a28 --- /dev/null +++ b/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). + %: diff --git a/python-sphinx.spec b/python-sphinx.spec index efe29de..0ef815e 100644 --- a/python-sphinx.spec +++ b/python-sphinx.spec @@ -8,8 +8,8 @@ %global upstream_name Sphinx Name: python-sphinx -Version: 1.1.3 -Release: 8%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Python documentation generator Group: Development/Tools @@ -21,21 +21,16 @@ 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 BuildArch: noarch BuildRequires: python2-devel >= 2.4 BuildRequires: python-setuptools BuildRequires: python-docutils BuildRequires: python-jinja2 +BuildRequires: python-pygments BuildRequires: python-nose -# Test dependencies -BuildRequires: texlive-latex +#BuildRequires: texlive-latex %if 0%{?with_python3} BuildRequires: python3-devel @@ -49,6 +44,11 @@ BuildRequires: python3-nose Requires: python-docutils Requires: python-jinja2 Requires: python-pygments +# for latex builder +Requires: texlive-framed +Requires: texlive-threeparttable +Requires: texlive-titlesec +Requires: texlive-wrapfig %description Sphinx is a tool that makes it easy to create intelligent and @@ -86,6 +86,11 @@ Group: Development/Tools Requires: python3-docutils Requires: python3-jinja2 Requires: python3-pygments +# for latex builder +Requires: texlive-framed +Requires: texlive-threeparttable +Requires: texlive-titlesec +Requires: texlive-wrapfig %description -n python3-sphinx Sphinx is a tool that makes it easy to create intelligent and @@ -137,11 +142,9 @@ This package contains documentation in reST and HTML formats. %prep %setup -q -n %{upstream_name}-%{version}%{?prerel} +%patch0 -p1 -b .mantarget sed '1d' -i sphinx/pycode/pgen2/token.py -%patch0 -p1 -%patch1 -p1 - %if 0%{?with_python3} rm -rf %{py3dir} cp -a . %{py3dir} @@ -203,7 +206,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 @@ -227,14 +230,14 @@ popd make test %if 0%{?with_python3} pushd %{py3dir} -make test +PYTHON=python3 make test popd %endif # with_python3 %files -f sphinx.lang %defattr(-,root,root,-) -%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO +%doc AUTHORS CHANGES EXAMPLES LICENSE README.rst TODO %exclude %{_bindir}/sphinx-*-%{python3_version} %{_bindir}/sphinx-* %{python_sitelib}/* @@ -246,7 +249,7 @@ popd %if 0%{?with_python3} %files -n python3-sphinx -%doc AUTHORS CHANGES EXAMPLES LICENSE README TODO +%doc AUTHORS CHANGES EXAMPLES LICENSE README.rst TODO %{_bindir}/sphinx-*-%{python3_version} %{python3_sitelib}/* %dir %{_datadir}/sphinx/ @@ -261,6 +264,9 @@ popd %changelog +* Thu Feb 13 2014 Michel Salim - 1.2.1-1 +- Update to 1.2.1 + * Sun Aug 04 2013 Fedora Release Engineering - 1.1.3-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 4609f5c..c8159be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f55a6d4f87fc6d528120c5d1f983e98 Sphinx-1.1.3.tar.gz +104494f036889122c9f403ae065ae7a9 Sphinx-1.2.1.tar.gz diff --git a/sphinx-docutils-0.10.patch b/sphinx-docutils-0.10.patch deleted file mode 100644 index 7f4f331..0000000 --- a/sphinx-docutils-0.10.patch +++ /dev/null @@ -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 = []