Author: thl Update of /cvs/free/rpms/libdvbpsi/EL-5 In directory se02.es.rpmfusion.net:/tmp/cvs-serv27617 Modified Files: libdvbpsi.spec Added Files: libdvbpsi-0.1.6-docsvg.patch Log Message: * Mon Sep 08 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.1.6-3.1 - Generate SVG instead of PNG in documentation (RHEL graphviz can't write PNG); Patch is a modified version of one found in the elvn repo (Lubomir Rintel) libdvbpsi-0.1.6-docsvg.patch: --- NEW FILE libdvbpsi-0.1.6-docsvg.patch --- diff -Naur libdvbpsi5-0.1.6.org/doc/doxygen.cfg libdvbpsi5-0.1.6/doc/doxygen.cfg --- libdvbpsi5-0.1.6.org/doc/doxygen.cfg 2008-09-08 18:52:55.000000000 +0200 +++ libdvbpsi5-0.1.6/doc/doxygen.cfg 2008-09-08 18:53:25.000000000 +0200 @@ -836,10 +836,10 @@ GRAPHICAL_HIERARCHY = YES # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are gif, jpg, and png +# generated by dot. Possible values are gif, jpg, and svg # If left blank gif will be used. -DOT_IMAGE_FORMAT = png +DOT_IMAGE_FORMAT = svg # The tag DOT_PATH can be used to specify the path where the dot tool can be # found. If left blank, it is assumed the dot tool can be found on the path. diff -Naur libdvbpsi5-0.1.6.org/doc/Makefile.am libdvbpsi5-0.1.6/doc/Makefile.am --- libdvbpsi5-0.1.6.org/doc/Makefile.am 2008-09-08 18:52:55.000000000 +0200 +++ libdvbpsi5-0.1.6/doc/Makefile.am 2008-09-08 18:53:25.000000000 +0200 @@ -3,12 +3,12 @@ EXTRA_DIST=index.doxygen structure.doxygen usage.doxygen newdec.doxygen \ decoder.dot doxygen.cfg -MOSTLYCLEANFILES=decoder.png +MOSTLYCLEANFILES=decoder.svg -doc: decoder.png +doc: decoder.svg doxygen doxygen.cfg - cp decoder.png doxygen/html + cp decoder.svg doxygen/html -decoder.png: decoder.dot - dot -Tpng -o $@ $< +decoder.svg: decoder.dot + dot -Tsvg -o $@ $< diff -Naur libdvbpsi5-0.1.6.org/doc/Makefile.in libdvbpsi5-0.1.6/doc/Makefile.in --- libdvbpsi5-0.1.6.org/doc/Makefile.in 2008-09-08 18:52:55.000000000 +0200 +++ libdvbpsi5-0.1.6/doc/Makefile.in 2008-09-08 18:53:49.000000000 +0200 @@ -158,7 +158,7 @@ EXTRA_DIST = index.doxygen structure.doxygen usage.doxygen newdec.doxygen \ decoder.dot doxygen.cfg -MOSTLYCLEANFILES = decoder.png +MOSTLYCLEANFILES = decoder.svg all: all-am .SUFFIXES: @@ -321,12 +321,12 @@ uninstall-info-am -doc: decoder.png +doc: decoder.svg doxygen doxygen.cfg - cp decoder.png doxygen/html + cp decoder.svg doxygen/html -decoder.png: decoder.dot - dot -Tpng -o $@ $< +decoder.svg: decoder.dot + dot -Tsvg -o $@ $< # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Naur libdvbpsi5-0.1.6.org/doc/structure.doxygen libdvbpsi5-0.1.6/doc/structure.doxygen --- libdvbpsi5-0.1.6.org/doc/structure.doxygen 2008-09-08 18:52:55.000000000 +0200 +++ libdvbpsi5-0.1.6/doc/structure.doxygen 2008-09-08 18:53:25.000000000 +0200 @@ -2,7 +2,7 @@ <p>The PSI decoder and the specific decoder:</p> -<img src="decoder.png" /> +<img src="decoder.svg" /> <p>Each decoder is split into two entities:</p> Index: libdvbpsi.spec =================================================================== RCS file: /cvs/free/rpms/libdvbpsi/EL-5/libdvbpsi.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libdvbpsi.spec 4 Aug 2008 19:00:28 -0000 1.1 +++ libdvbpsi.spec 8 Sep 2008 17:00:21 -0000 1.2 @@ -3,11 +3,12 @@ Summary: Library for MPEG TS and DVB PSI tables decoding and generation Name: libdvbpsi Version: 0.1.6 -Release: 3%{?dist} +Release: 3%{?dist}.1 License: GPLv2+ -Group: System Environment/Libraries +Group: System Environment/Libraries URL: http://www.videolan.org/developers/libdvbpsi.html Source0: http://download.videolan.org/pub/libdvbpsi/%{version}/%{real_name}-%{vers... +Patch1: libdvbpsi-0.1.6-docsvg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: graphviz doxygen @@ -31,8 +32,8 @@ %prep %setup -q -n %{real_name}-%{version} - - +%patch1 -p1 -b .docsvg +touch -r aclocal.m4 configure.ac # ----------------------------------------------------------------------------- @@ -72,6 +73,10 @@ # ----------------------------------------------------------------------------- %changelog +* Mon Sep 08 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.1.6-3.1 +- Generate SVG instead of PNG in documentation (RHEL graphviz can't write PNG); + Patch is a modified version of one found in the elvn repo (Lubomir Rintel) + * Mon Aug 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.1.6-3 - rebuild