[packages/sphinx-pdg] - rel 2; more guarding against: sphinx-build "error: option -b not recognized"

[arekm]

commit 0c61ae2562b4f210a752933367343a65d9f846ff
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Oct 19 22:42:39 2014 +0200

    - rel 2; more guarding against: sphinx-build "error: option -b not recognized"

 sphinx-pdg-bug-1226.patch | 30 ++++++++++++++++++++++++++++++
 sphinx-pdg.spec           |  4 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/sphinx-pdg.spec b/sphinx-pdg.spec
index f9a18a9..9663867 100644
--- a/sphinx-pdg.spec
+++ b/sphinx-pdg.spec
@@ -5,11 +5,12 @@ Summary:	Sphinx - Python documentation generator
 Summary(pl.UTF-8):	Sphinx - narzędzie do tworzenia dokumentacji dla Pythona
 Name:		sphinx-pdg
 Version:	1.2.3
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Languages/Python
 Source0:	https://pypi.python.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz
 # Source0-md5:	a98c93124035b4cd7183604aec656cb3
+Patch0:		sphinx-pdg-bug-1226.patch
 URL:		http://sphinx.pocoo.org/
 BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	python-distribute
@@ -110,6 +111,7 @@ sphinx-pdg-3.
 
 %prep
 %setup -q -n Sphinx-%{version}
+%patch0 -p1
 
 %build
 %{__python} setup.py build -b build-2
diff --git a/sphinx-pdg-bug-1226.patch b/sphinx-pdg-bug-1226.patch
new file mode 100644
index 0000000..70f9a9e
--- /dev/null
+++ b/sphinx-pdg-bug-1226.patch
@@ -0,0 +1,30 @@
+# HG changeset patch
+# User Georg Brandl <georg at python.org>
+# Date 1413746745 -7200
+# Node ID 2d66ade078e490968b21022918b2074389b77dd0
+# Parent  1e2406af4606eb1f03fd48262114938922e949b8
+Guard against sys.exit() called while exec()ing the conf.py file.
+
+diff --git a/sphinx/config.py b/sphinx/config.py
+--- a/sphinx/config.py
++++ b/sphinx/config.py
+@@ -24,6 +24,9 @@
+ CONFIG_SYNTAX_ERROR = "There is a syntax error in your configuration file: %s"
+ if PY3:
+     CONFIG_SYNTAX_ERROR += "\nDid you change the syntax from 2.x to 3.x?"
++CONFIG_EXIT_ERROR = "The configuration file (or one of the modules it imports) " \
++                    "called sys.exit()"
++
+ 
+ class Config(object):
+     """
+@@ -232,6 +232,8 @@ class Config(object):
+                     execfile_(filename, config)
+                 except SyntaxError, err:
+                     raise ConfigError(CONFIG_SYNTAX_ERROR % err)
++                except SystemExit:
++                    raise ConfigError(CONFIG_EXIT_ERROR)
+             finally:
+                 os.chdir(olddir)
+ 
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sphinx-pdg.git/commitdiff/0c61ae2562b4f210a752933367343a65d9f846ff