Hello community, here is the log from the commit of package python-Sphinx for openSUSE:Factory checked in at 2013-11-14 08:43:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Sphinx (Old) and /work/SRC/openSUSE:Factory/.python-Sphinx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Sphinx" Changes: -------- --- /work/SRC/openSUSE:Factory/python-Sphinx/python-Sphinx.changes 2013-11-07 08:43:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-Sphinx.new/python-Sphinx.changes 2013-11-14 08:43:33.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 13 14:54:09 UTC 2013 - speili...@suse.com + +- Add sphinx-setup_command_unicode.patch: Backport of + https://bitbucket.org/birkenfeld/sphinx/pull-request/193/ + +------------------------------------------------------------------- New: ---- sphinx-setup_command_unicode.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Sphinx.spec ++++++ --- /var/tmp/diff_new_pack.CaDqOa/_old 2013-11-14 08:43:34.000000000 +0100 +++ /var/tmp/diff_new_pack.CaDqOa/_new 2013-11-14 08:43:34.000000000 +0100 @@ -24,6 +24,8 @@ License: BSD-2-Clause Group: Development/Languages/Python Source: http://pypi.python.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz +# PATCH-FIX-UPSTREAM speili...@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 @@ -78,6 +80,7 @@ %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: ++++++ sphinx-setup_command_unicode.patch ++++++ 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() -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
