rpm/python-Sphinx
SHA256
1
0
Fork 0
forked from pool/python-Sphinx
Code Pull Requests Activity

Accepting request 225034 from devel:languages:python

Browse Source 
- Update to 1.2.2:
  - PR#211: When checking for existence of the html_logo file, check the full
    relative path and not the basename.
  - PR#212: Fix traceback with autodoc and __init__ methods without docstring.
  - PR#213: Fix a missing import in the setup command.
  - #1357: Option names documented by option are now again allowed to not start
    with a dash or slash, and referencing them will work correctly.
  - #1358: Fix handling of image paths outside of the source directory when
    using the “wildcard” style reference.
  - #1374: Fix for autosummary generating overly-long summaries if first line
    doesn’t end with a period.
  - #1383: Fix Python 2.5 compatibility of sphinx-apidoc.
  - #1391: Actually prevent using “pngmath” and “mathjax” extensions at the
    same time in sphinx-quickstart.
  - #1386: Fix bug preventing more than one theme being added by the entry
    point mechanism.
  - #1370: Ignore “toctree” nodes in text writer, instead of raising.
  - #1364: Fix ‘make gettext’ fails when the ‘.. todolist::’ directive is
    present.
  - #1367: Fix a change of PR#96 that break
    sphinx.util.docfields.Field.make_field interface/behavior for item argument
    usage.

- Update to version 1.2.1
  + See CHANGES
- Fix update-alternatives usage
- Removed sphinx-setup_command_unicode.patch (upstream)

OBS-URL: https://build.opensuse.org/request/show/225034
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-Sphinx?expand=0&rev=27
This commit is contained in:
Stephan Kulow 2014-03-11 19:33:13 +00:00 committed by Git OBS Bridge
commit f9da9d78fb
5 changed files with 53 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Sphinx-1.2.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2d3415f5b3e6b7535877f4c84fe228bdb802a8993c239b2d02c23169d67349bd
size 3143671

3
Sphinx-1.2b3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c1013bd85641cc1dd91944e3ad2c9d2fc78acc11daea2212b041e0e31f4ddc4
size 3125701

34
python-Sphinx.changes
View File

@ -1,3 +1,37 @@
-------------------------------------------------------------------
Thu Mar 6 12:50:16 UTC 2014 - mcihar@suse.cz
- Update to 1.2.2:
- PR#211: When checking for existence of the html_logo file, check the full
relative path and not the basename.
- PR#212: Fix traceback with autodoc and __init__ methods without docstring.
- PR#213: Fix a missing import in the setup command.
- #1357: Option names documented by option are now again allowed to not start
with a dash or slash, and referencing them will work correctly.
- #1358: Fix handling of image paths outside of the source directory when
using the “wildcard” style reference.
- #1374: Fix for autosummary generating overly-long summaries if first line
doesn’t end with a period.
- #1383: Fix Python 2.5 compatibility of sphinx-apidoc.
- #1391: Actually prevent using “pngmath” and “mathjax” extensions at the
same time in sphinx-quickstart.
- #1386: Fix bug preventing more than one theme being added by the entry
point mechanism.
- #1370: Ignore “toctree” nodes in text writer, instead of raising.
- #1364: Fix ‘make gettext’ fails when the ‘.. todolist::’ directive is
present.
- #1367: Fix a change of PR#96 that break
sphinx.util.docfields.Field.make_field interface/behavior for item argument
usage.
-------------------------------------------------------------------
Mon Feb 10 15:08:45 UTC 2014 - speilicke@suse.com
- Update to version 1.2.1
+ See CHANGES
- Fix update-alternatives usage
- Removed sphinx-setup_command_unicode.patch (upstream)
-------------------------------------------------------------------
Mon Nov 18 09:05:53 UTC 2013 - speilicke@suse.com

47
python-Sphinx.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package python-Sphinx
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,15 +17,13 @@
Name: python-Sphinx
Version: 1.2b3
Version: 1.2.2
Release: 0
Url: http://sphinx.pocoo.org
Summary: Python documentation generator
License: BSD-2-Clause
Group: Development/Languages/Python
Source: http://pypi.python.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz
# PATCH-FIX-UPSTREAM speilicke@suse.com -- Backport of https://bitbucket.org/birkenfeld/sphinx/pull-request/193/
Patch0: sphinx-setup_command_unicode.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-devel
BuildRequires: python-setuptools
@ -80,7 +78,6 @@ and translating suite, the Docutils.
%prep
%setup -q -n Sphinx-%{version}
%patch0 -p1
sed -i '/#\!/d' sphinx/pycode/pgen2/token.py # Fix non-excutable-script warning
# Add Interpreter version suffix to entrypoints (and thus /usr/bin binaries) to
# allow for update-alternatives later on:
@ -93,32 +90,22 @@ python setup.py build_sphinx -b man
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
for B in apidoc autogen build quickstart ; do
ln -s %{_bindir}/sphinx-$B-%{py_ver} %{buildroot}%{_bindir}/sphinx-$B
touch %{buildroot}%{_sysconfdir}/alternatives/sphinx-$B
ln -sf %{_sysconfdir}/alternatives/sphinx-$B %{buildroot}/%{_bindir}/sphinx-$B
done
install -d %{buildroot}%{_mandir}/man1/
for M in all apidoc build quickstart ; do
install -m 644 build/sphinx/man/sphinx-$M.1 %{buildroot}%{_mandir}/man1/sphinx-$M-%{py_ver}.1
ln -s %{_mandir}/man1/sphinx-$M-%{py_ver}.1 %{buildroot}%{_mandir}/man1/sphinx-$M.1
touch %{buildroot}%{_sysconfdir}/alternatives/sphinx-$M.1.gz
ln -sf %{_sysconfdir}/alternatives/sphinx-$M.1.gz %{buildroot}%{_mandir}/man1/sphinx-$M.1.gz
done
%find_lang sphinx
%check
PYTHONPATH=$PWD make test
%pre
# Since /usr/bin/sphinx-* became ghosted to be used with update-alternatives, we have
# to get rid of the old binary resulting from the non-update-alternativies-ified package:
[[ ! -L %{_bindir}/sphinx-apidoc ]] && rm -f %{_bindir}/sphinx-apidoc
[[ ! -L %{_bindir}/sphinx-build ]] && rm -f %{_bindir}/sphinx-build
[[ ! -L %{_bindir}/sphinx-autogen ]] && rm -f %{_bindir}/sphinx-autogen
[[ ! -L %{_bindir}/sphinx-quickstart ]] && rm -f %{_bindir}/sphinx-quickstart
[[ ! -L %{_mandir}/man1/sphinx-all.1.gz ]] && rm -f %{_mandir}/man1/sphinx-all.1.gz
[[ ! -L %{_mandir}/man1/sphinx-apidoc.1.gz ]] && rm -f %{_mandir}/man1/sphinx-apidoc.1.gz
[[ ! -L %{_mandir}/man1/sphinx-build.1.gz ]] && rm -f %{_mandir}/man1/sphinx-build.1.gz
[[ ! -L %{_mandir}/man1/sphinx-quickstart.1.gz ]] && rm -f %{_mandir}/man1/sphinx-quickstart.1.gz
exit 0
%post
update-alternatives \
--install %{_bindir}/sphinx-apidoc sphinx-apidoc %{_bindir}/sphinx-apidoc-%{py_ver} 20 \
@ -130,7 +117,7 @@ update-alternatives \
--slave %{_mandir}/man1/sphinx-build.1.gz sphinx-build.1 %{_mandir}/sphinx-build-%{py_ver}.1.gz \
--slave %{_mandir}/man1/sphinx-quickstart.1.gz sphinx-quickstart.1 %{_mandir}/sphinx-quickstart-%{py_ver}.1.gz \
%preun
%postun
if [ $1 -eq 0 ] ; then
update-alternatives --remove sphinx-apidoc %{_bindir}/sphinx-apidoc-%{py_ver}
fi
@ -138,25 +125,24 @@ fi
%files -f sphinx.lang
%defattr(-,root,root,-)
%doc AUTHORS CHANGES LICENSE README.rst
%ghost %{_bindir}/sphinx-apidoc
%{_bindir}/sphinx-apidoc
%{_bindir}/sphinx-apidoc-%{py_ver}
%ghost %{_bindir}/sphinx-autogen
%{_bindir}/sphinx-autogen
%{_bindir}/sphinx-autogen-%{py_ver}
%ghost %{_bindir}/sphinx-build
%{_bindir}/sphinx-build
%{_bindir}/sphinx-build-%{py_ver}
%ghost %{_bindir}/sphinx-quickstart
%{_bindir}/sphinx-quickstart
%{_bindir}/sphinx-quickstart-%{py_ver}
%ghost %{_mandir}/man1/sphinx-all.1.gz
%{_mandir}/man1/sphinx-all.1.gz
%{_mandir}/man1/sphinx-all-%{py_ver}.1.gz
%ghost %{_mandir}/man1/sphinx-apidoc.1.gz
%{_mandir}/man1/sphinx-apidoc.1.gz
%{_mandir}/man1/sphinx-apidoc-%{py_ver}.1.gz
%ghost %{_mandir}/man1/sphinx-build.1.gz
%{_mandir}/man1/sphinx-build.1.gz
%{_mandir}/man1/sphinx-build-%{py_ver}.1.gz
%ghost %{_mandir}/man1/sphinx-quickstart.1.gz
%{_mandir}/man1/sphinx-quickstart.1.gz
%{_mandir}/man1/sphinx-quickstart-%{py_ver}.1.gz
%{python_sitelib}/sphinx/
%{python_sitelib}/Sphinx-%{version}-py%{py_ver}.egg-info
%if 0%{?suse_version} >= 1230
%ghost %{_sysconfdir}/alternatives/sphinx-apidoc
%ghost %{_sysconfdir}/alternatives/sphinx-autogen
%ghost %{_sysconfdir}/alternatives/sphinx-build
@ -165,7 +151,6 @@ fi
%ghost %{_sysconfdir}/alternatives/sphinx-apidoc.1.gz
%ghost %{_sysconfdir}/alternatives/sphinx-build.1.gz
%ghost %{_sysconfdir}/alternatives/sphinx-quickstart.1.gz
%endif
%files doc
%defattr(-,root,root,-)

31
sphinx-setup_command_unicode.patch
View File

@ -1,31 +0,0 @@
diff -r 86e59496553b sphinx/setup_command.py
--- a/sphinx/setup_command.py Tue Nov 12 15:17:09 2013 +0000
+++ b/sphinx/setup_command.py Wed Nov 13 15:41:12 2013 +0100
@@ -14,6 +14,7 @@
import sys
import os
+import types
from StringIO import StringIO
from distutils.cmd import Command
@@ -98,6 +99,19 @@
return root
return None
+ # Overriding distutils' Command._ensure_stringlike which doesn't support
+ # unicode, causing finalize_options to fail if invoked again. Workaround
+ # for http://bugs.python.org/issue19570
+ def _ensure_stringlike(self, option, what, default=None):
+ val = getattr(self, option)
+ if val is None:
+ setattr(self, option, default)
+ return default
+ elif not isinstance(val, types.StringTypes):
+ raise DistutilsOptionError("'%s' must be a %s (got `%s`)"
+ % (option, what, val))
+ return val
+
def finalize_options(self):
if self.source_dir is None:
self.source_dir = self._guess_source_dir()