rpms/epydoc/devel epydoc-3.0.1-giftopng.patch, NONE, 1.1 epydoc.spec, 1.13, 1.14

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/epydoc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8604

Modified Files:
	epydoc.spec 
Added Files:
	epydoc-3.0.1-giftopng.patch 
Log Message:
Include patch to use png instead of gif for generated images (#459857).


epydoc-3.0.1-giftopng.patch:

--- NEW FILE epydoc-3.0.1-giftopng.patch ---
diff -Naupr epydoc-3.0.1.orig/epydoc/docwriter/dotgraph.py epydoc-3.0.1/epydoc/docwriter/dotgraph.py
--- epydoc-3.0.1.orig/epydoc/docwriter/dotgraph.py	2008-01-28 19:15:33.000000000 +0100
+++ epydoc-3.0.1/epydoc/docwriter/dotgraph.py	2008-12-22 20:19:42.037246526 +0100
@@ -140,7 +140,7 @@ class DotGraph:
         # the cmapx with a single call to dot.  Otherwise, we need to
         # run dot twice.
         if get_dot_version() > [1,8,10]:
-            cmapx = self._run_dot('-Tgif', '-o%s' % image_file, '-Tcmapx')
+            cmapx = self._run_dot('-Tpng', '-o%s' % image_file, '-Tcmapx')
             if cmapx is None: return '' # failed to render
         else:
             if not self.write(image_file):
@@ -220,7 +220,7 @@ class DotGraph:
                 if url: attribs['href'] = url
                 else: del attribs['href']
                 
-    def write(self, filename, language='gif'):
+    def write(self, filename, language='png'):
         """
         Render the graph using the output format `language`, and write
         the result to `filename`.
@@ -234,7 +234,7 @@ class DotGraph:
             result = result.decode('utf-8')
         return (result is not None)
 
-    def render(self, language='gif'):
+    def render(self, language='png'):
         """
         Use the ``dot`` command to render this graph, using the output
         format `language`.  Return the result as a string, or ``None``
diff -Naupr epydoc-3.0.1.orig/epydoc/docwriter/html.py epydoc-3.0.1/epydoc/docwriter/html.py
--- epydoc-3.0.1.orig/epydoc/docwriter/html.py	2008-01-29 13:43:04.000000000 +0100
+++ epydoc-3.0.1/epydoc/docwriter/html.py	2008-12-22 20:19:56.195371915 +0100
@@ -1627,7 +1627,7 @@ class HTMLWriter:
     def render_graph(self, graph):
         if graph is None: return ''
         graph.caption = graph.title = None
-        image_url = '%s.gif' % graph.uid
+        image_url = '%s.png' % graph.uid
         image_file = os.path.join(self._directory, image_url)
         return graph.to_html(image_file, image_url)
     
diff -Naupr epydoc-3.0.1.orig/epydoc/markup/epytext.py epydoc-3.0.1/epydoc/markup/epytext.py
--- epydoc-3.0.1.orig/epydoc/markup/epytext.py	2007-09-26 06:45:35.000000000 +0200
+++ epydoc-3.0.1/epydoc/markup/epytext.py	2008-12-22 20:20:14.630371505 +0100
@@ -1878,7 +1878,7 @@ class ParsedEpytextDocstring(ParsedDocst
                                       docindex, context)
             if not graph: return ''
             # Write the graph.
-            image_url = '%s.gif' % graph.uid
+            image_url = '%s.png' % graph.uid
             image_file = os.path.join(directory, image_url)
             return graph.to_html(image_file, image_url)
         else:
diff -Naupr epydoc-3.0.1.orig/epydoc/markup/restructuredtext.py epydoc-3.0.1/epydoc/markup/restructuredtext.py
--- epydoc-3.0.1.orig/epydoc/markup/restructuredtext.py	2008-01-28 19:15:33.000000000 +0100
+++ epydoc-3.0.1/epydoc/markup/restructuredtext.py	2008-12-22 20:20:23.679309245 +0100
@@ -663,7 +663,7 @@ class _EpydocHTMLTranslator(HTMLTranslat
         if graph is None: return
         
         # Write the graph.
-        image_url = '%s.gif' % graph.uid
+        image_url = '%s.png' % graph.uid
         image_file = os.path.join(self._directory, image_url)
         self.body.append(graph.to_html(image_file, image_url))
         raise SkipNode()


Index: epydoc.spec
===================================================================
RCS file: /cvs/extras/rpms/epydoc/devel/epydoc.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- epydoc.spec	29 Nov 2008 16:36:53 -0000	1.13
+++ epydoc.spec	22 Dec 2008 19:25:13 -0000	1.14
@@ -3,13 +3,14 @@
 Summary: Automatic API documentation generation tool for Python
 Name: epydoc
 Version: 3.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Tools
 License: MIT
 URL: http://epydoc.sourceforge.net/
 Source0: http://dl.sf.net/epydoc/epydoc-%{version}.tar.gz
 Source1: epydocgui.desktop
 Patch0: epydoc-3.0.1-nohashbang.patch
+Patch1: epydoc-3.0.1-giftopng.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: tkinter
 BuildRequires: python-devel
@@ -29,6 +30,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .nohashbang
+%patch1 -p1 -b .giftopng
 
 
 %build
@@ -70,6 +72,9 @@
 
 
 %changelog
+* Mon Dec 22 2008 Matthias Saou <http://freshrpms.net/> 3.0.1-3
+- Include patch to use png instead of gif for generated images (#459857).
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 3.0.1-2
 - Rebuild for Python 2.6