diff --git a/graphviz-black.patch b/graphviz-black.patch new file mode 100644 index 0000000..b5b6a22 --- /dev/null +++ b/graphviz-black.patch @@ -0,0 +1,29 @@ +--- graphviz-2.12/lib/common/colxlate.c.orig 2006-07-26 22:44:05.000000000 -0500 ++++ graphviz-2.12/lib/common/colxlate.c 2007-07-12 14:07:13.000000000 -0500 +@@ -1,4 +1,4 @@ +-/* $Id: graphviz-black.patch,v 1.1 2007/07/12 19:41:53 jima Exp $ $Revision: 1.1 $ */ ++/* $Id: graphviz-black.patch,v 1.1 2007/07/12 19:41:53 jima Exp $ $Revision: 1.1 $ */ + /* vim:set shiftwidth=4 ts=8: */ + + /********************************************************** +@@ -180,6 +180,10 @@ + + /* resolveColor: + * Resolve input color str allowing color scheme namespaces. ++ * 0) "black" => "black" ++ * NB: This is something of a hack due to the remaining codegen. ++ * Once these are gone, this case could be removed and all references ++ * to "black" could be replaced by "/X11/black". + * 1) No initial / => + * if colorscheme is defined and no "X11", return /colorscheme/str + * else return str +@@ -214,7 +218,8 @@ + char* ss; /* second slash */ + char* c2; /* second char */ + +- if (*str == '/') { /* if begins with '/' */ ++ if ((*str == 'b') || !strncmp(str+1,"lack",4)) return str; ++ else if (*str == '/') { /* if begins with '/' */ + c2 = str+1; + if ((ss = strchr(c2, '/'))) { /* if has second '/' */ + if (*c2 == '/') { /* if second '/' is second character */ diff --git a/graphviz.spec b/graphviz.spec index 5bb1969..e4e4a05 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -7,13 +7,14 @@ #-- graphviz src.rpm -------------------------------------------------------- Name: graphviz Version: 2.12 -Release: 7%{?dist} +Release: 8%{?dist} License: CPL URL: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.12.tar.gz Patch0: %{name}-php5.patch Patch1: %{name}-libcdt.patch +Patch2: %{name}-black.patch # graphviz is relocatable #Prefix: /usr @@ -403,6 +404,7 @@ Provides some additional PDF and HTML documentation for graphviz. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # XXX ix86 only used to have -ffast-math, let's use everywhere @@ -439,6 +441,9 @@ rm -rf $RPM_BUILD_ROOT #-- changelog -------------------------------------------------- %changelog +* Thu Jul 12 2007 Patrick "Jima" Laughton 2.12-8 +- Patch to fix BZ#241790 (thanks John!) + * Sat May 05 2007 Patrick "Jima" Laughton 2.12-7 - Patch to fix BZ#237496 - Disabling relocatability to work around BZ#237082