Version: 1.3.1

sphinx-pdg-bug-1226.patch – applied upstream

diff --git a/sphinx-pdg-bug-1226.patch b/sphinx-pdg-bug-1226.patch
deleted file mode 100644 (file)
index 70f9a9e..0000000
--- a/sphinx-pdg-bug-1226.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# HG changeset patch
-# User Georg Brandl <georg@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)
- 
-

diff --git a/sphinx-pdg.spec b/sphinx-pdg.spec
index adbc366617ed0784c042f2c70072585c83eec087..e9d31ec21e2b04bf75aecbe411b70ca6e485a670 100644 (file)
--- a/sphinx-pdg.spec
+++ b/sphinx-pdg.spec
@@ -4,13 +4,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:       4
+Version:       1.3.1
+Release:       1
 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
+# Source0-md5: 8786a194acf9673464c5455b11fd4332
 URL:           http://sphinx.pocoo.org/
 BuildRequires: python-devel >= 1:2.5
 BuildRequires: python-setuptools > 7.0
@@ -111,7 +110,6 @@ sphinx-pdg-3.
 
 %prep
 %setup -q -n Sphinx-%{version}
-%patch0 -p1
 
 %build
 %{__python} setup.py build -b build-2
@@ -143,7 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGES EXAMPLES LICENSE PKG-INFO README.rst TODO
+%doc AUTHORS CHANGES EXAMPLES LICENSE PKG-INFO README.rst
 %attr(755,root,root) %{_bindir}/sphinx-autogen
 %attr(755,root,root) %{_bindir}/sphinx-apidoc
 %attr(755,root,root) %{_bindir}/sphinx-build
@@ -151,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files 3
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGES EXAMPLES LICENSE PKG-INFO README.rst TODO
+%doc AUTHORS CHANGES EXAMPLES LICENSE PKG-INFO README.rst
 %attr(755,root,root) %{_bindir}/sphinx-autogen-3
 %attr(755,root,root) %{_bindir}/sphinx-apidoc-3
 %attr(755,root,root) %{_bindir}/sphinx-build-3