[rst2pdf] Updated fix for bz #709119
Sergio Pascual
sergiopr at fedoraproject.org
Wed Jun 8 09:31:42 UTC 2011
commit 0259a0aea50324db63437441cc3d23280e02f9d7
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date: Wed Jun 8 11:31:15 2011 +0200
Updated fix for bz #709119
rst2pdf-bz709119.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
rst2pdf.spec | 5 ++++-
2 files changed, 48 insertions(+), 1 deletions(-)
---
diff --git a/rst2pdf-bz709119.patch b/rst2pdf-bz709119.patch
index d7269f2..6074a79 100644
--- a/rst2pdf-bz709119.patch
+++ b/rst2pdf-bz709119.patch
@@ -29,3 +29,47 @@ diff -ur rst2pdf-0.16/rst2pdf/createpdf.py rst2pdf-0.16.new/rst2pdf/createpdf.py
except ImportError:
log.warning("Can't load Docutils module \
for language %s", lang)
+diff -ur rst2pdf-0.16/rst2pdf/pdfbuilder.py rst2pdf-0.16.new/rst2pdf/pdfbuilder.py
+--- rst2pdf-0.16/rst2pdf/pdfbuilder.py 2010-10-06 22:17:48.000000000 +0200
++++ rst2pdf-0.16.new/rst2pdf/pdfbuilder.py 2011-06-08 11:23:11.548136067 +0200
+@@ -185,15 +185,15 @@
+ if self.config.language:
+ lang = self.config.language
+ try:
+- self.docutils_languages[lang] = get_language(lang)
++ self.docutils_languages[lang] = get_language(lang, None)
+ except ImportError:
+ try:
+ self.docutils_languages[lang] = \
+- get_language(lang.split('_', 1)[0])
++ get_language(lang.split('_', 1)[0], None)
+ except ImportError:
+ log.warning("Can't load Docutils module \
+ for language %s", lang)
+- langmod = languages.get_language('en')
++ langmod = languages.get_language('en', None)
+
+ if self.opts.get('pdf_use_index',self.config.pdf_use_index):
+ # Add index at the end of the document
+@@ -530,17 +530,17 @@
+ self.document.walkabout(visitor)
+ self.docutils_languages = {}
+ lang = self.config.language or 'en'
+- langmod = languages.get_language('en')
++ langmod = languages.get_language('en', None)
+ try:
+- langmod = get_language(lang)
++ langmod = get_language(lang, None)
+ except ImportError:
+ try:
+ self.docutils_languages[lang] = \
+- get_language(lang.split('_', 1)[0])
++ get_language(lang.split('_', 1)[0], None)
+ except ImportError:
+ log.warning("Can't load Docutils module "\
+ "for language %s", lang)
+- langmod = languages.get_language('en')
++ langmod = languages.get_language('en', None)
+
+ # Generate Contents topic manually
+ if self.use_toc:
diff --git a/rst2pdf.spec b/rst2pdf.spec
index e344254..c128563 100644
--- a/rst2pdf.spec
+++ b/rst2pdf.spec
@@ -2,7 +2,7 @@
Name: rst2pdf
Version: 0.16
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Tool for transforming reStructuredText to PDF
License: MIT
@@ -52,6 +52,9 @@ rm -rf %{buildroot}
%{_mandir}/man1/*
%changelog
+* Wed Jun 08 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.16-4
+- Updated fix for bz #709119
+
* Tue May 31 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.16-3
- Fix for bz #709119
More information about the scm-commits
mailing list