From 62a4b969150097bbe02a28b3258319bc4f4435c63673a3f51f22e4d960acb6b7 Mon Sep 17 00:00:00 2001 From: Philipp Thomas Date: Tue, 3 Sep 2013 14:40:43 +0000 Subject: [PATCH] - Update to 2.32.0. Changes since 2.28.0: 2.32.0: - New version of xdot format, annotating gradient color schemes - Support for reading pdf images using poppler - Lefty/dotty/lneato now accept anonymous graphs - Add star node shape - Add two-tone (non-gradient) fill 2.30.1: - various build fixes 2.30.0: - Replaced libgraph with libcgraph; use of libgraph is now deprecated - New ranking algorithm that allows multiple subgraph constraints - Support edges using curved arcs. - Added new shapes used by the synthetic biology community. - For HTML-like labels, provide rounded cells, and dashed or dotted borders. - Add lcurve and rcurve arrowheads. - Add prototype pie chart and striped fills. - Support insets in treemaps to make containment clear - Add random rooted tree generation to gvgen - Allow GVPRPATH to specify that the default path be prepended or appended to it. - Support arbitrary lists of layers; allow the user to specify arbitrary layers for output. - A collection of gvpr scripts, which were part of the source package, are now installed in /share/graphviz/gvpr, and the that path is used as part of th default built-in path for gvpr. - Update libexpr to reflect Glenn Fowler's changes including scopes for variables. - Add next graph variable to gvpr - Modify dot and fdp so that a cluster's margin attribute will affect OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=59 --- graphviz-2.28.0.tar.gz | 3 - graphviz-2.32.0.tar.gz | 3 + graphviz-buffer_overflow.patch | 25 +++ graphviz-gd_png_check_sig.patch | 11 -- graphviz-plugins.changes | 56 ++++++ graphviz-plugins.spec | 13 +- graphviz-proper_prototypes.patch | 310 +++++++++++++++++++++++++++++++ graphviz.changes | 56 ++++++ graphviz.spec | 49 ++++- 9 files changed, 505 insertions(+), 21 deletions(-) delete mode 100644 graphviz-2.28.0.tar.gz create mode 100644 graphviz-2.32.0.tar.gz create mode 100644 graphviz-buffer_overflow.patch delete mode 100644 graphviz-gd_png_check_sig.patch create mode 100644 graphviz-proper_prototypes.patch diff --git a/graphviz-2.28.0.tar.gz b/graphviz-2.28.0.tar.gz deleted file mode 100644 index bd70733..0000000 --- a/graphviz-2.28.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3aa7973c578cae4cc26d9d6498c57ed06680cab9a4e940d0357a3c6527afc76 -size 19620087 diff --git a/graphviz-2.32.0.tar.gz b/graphviz-2.32.0.tar.gz new file mode 100644 index 0000000..89efa65 --- /dev/null +++ b/graphviz-2.32.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d853b2313e08a1dd0cce20d9ff8051acfa9ec418b5ba2dc65c8f4ddb07a7a77a +size 23756717 diff --git a/graphviz-buffer_overflow.patch b/graphviz-buffer_overflow.patch new file mode 100644 index 0000000..88d07a2 --- /dev/null +++ b/graphviz-buffer_overflow.patch @@ -0,0 +1,25 @@ +From: Philipp Thomas +Date: 2013-09-02 18:18:46+02:00 +Subject: Fix the buffer overflow + +C is defined as +pointf C[4] +so C[4] is a clear off-by-one. + +--- + lib/common/shapes.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: lib/common/shapes.c +=================================================================== +--- lib/common/shapes.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/common/shapes.c 2013-09-02 18:15:48.640408565 +0200 +@@ -1364,7 +1364,7 @@ void round_corners(GVJ_t * job, pointf * + C[2].y = C[1].y; + C[3].x = C[2].x; + C[3].y = C[0].y; +- C[4] = C[0]; ++// C[4] = C[0]; + gvrender_polyline(job, C, 5); + + /*dsDNA line right half*/ diff --git a/graphviz-gd_png_check_sig.patch b/graphviz-gd_png_check_sig.patch deleted file mode 100644 index a5973c9..0000000 --- a/graphviz-gd_png_check_sig.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/gd/gd_png.c -+++ lib/gd/gd_png.c -@@ -150,7 +150,7 @@ - return NULL; - } - -- if (!png_check_sig (sig, 8)) { /* bad signature */ -+ if (png_sig_cmp (sig, 0, 8)) { /* bad signature */ - return NULL; /* bad signature */ - } - diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes index 6b89d7d..e5597a1 100644 --- a/graphviz-plugins.changes +++ b/graphviz-plugins.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Tue Sep 3 13:55:25 CEST 2013 - pth@suse.de + +- Update to 2.32.0. Changes since 2.28.0: + 2.32.0: + - New version of xdot format, annotating gradient color schemes + - Support for reading pdf images using poppler + - Lefty/dotty/lneato now accept anonymous graphs + - Add star node shape + - Add two-tone (non-gradient) fill + 2.30.1: + - various build fixes + 2.30.0: + - Replaced libgraph with libcgraph; use of libgraph is now deprecated + - New ranking algorithm that allows multiple subgraph constraints + - Support edges using curved arcs. + - Added new shapes used by the synthetic biology community. + - For HTML-like labels, provide rounded cells, and dashed or dotted borders. + - Add lcurve and rcurve arrowheads. + - Add prototype pie chart and striped fills. + - Support insets in treemaps to make containment clear + - Add random rooted tree generation to gvgen + - Allow GVPRPATH to specify that the default path be prepended or + appended to it. + - Support arbitrary lists of layers; allow the user to specify arbitrary + layers for output. + - A collection of gvpr scripts, which were part of the source package, + are now installed in /share/graphviz/gvpr, and the that path + is used as part of th default built-in path for gvpr. + - Update libexpr to reflect Glenn Fowler's changes including scopes for + variables. + - Add next graph variable to gvpr + - Modify dot and fdp so that a cluster's margin attribute will affect + the space between the bounding box and nodes + - Modify the dijkstra tool to use only directed edges + - Output numbers without quotes if quotes are not needed on input + - Support gradient fill + - Provide support for webp images + - Fix tapered edges to use the dir attribute and arrowhead + - Add imagepath attribute + - Add help functionality to Graphviz.app + - Add ,, to html strings via svg + - Add tapered edges + - Add support for external labels + - Add initial implementation of graphml2gv + - Add basic horizontal and vertical rules to html tables + +- Remove graphviz-gd_png_check_sig.patch as the file to patch doesn't + exist anymore. +- Add graphviz-buffer_overflow.patch to fix a buffer ovderflow in + lib/common/shapes.c(round_corners). +- Add graphviz-proper_prototypes.patch that changes the conditional + from __STD_C to the standard conforming __STDC__ to get proper + prototypes. +- Run autoreconf to use -fno-strict-aliasing for libvmalloc sources + ------------------------------------------------------------------- Fri May 31 08:08:44 UTC 2013 - mhrusecky@suse.com diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index ac93f16..7e344d2 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -28,8 +28,11 @@ %bcond_without mono Name: graphviz-plugins +BuildRequires: autoconf +BuildRequires: automake BuildRequires: bison BuildRequires: flex +BuildRequires: freeglut-devel BuildRequires: freetype2-devel >= 2 BuildRequires: gcc-c++ BuildRequires: gd-devel @@ -42,6 +45,7 @@ BuildRequires: libexpat-devel BuildRequires: libgnomeui-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: libqt4-devel BuildRequires: libstdc++-devel BuildRequires: m4 %ifnarch aarch64 @@ -83,16 +87,17 @@ BuildRequires: pkgconfig(pango) %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif -Version: 2.28.0 +Version: 2.32.0 Release: 0 Summary: Graph Visualization Tools License: IPL-1.0 Group: Productivity/Graphics/Visualization/Graph Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz -Patch1: graphviz-gd_png_check_sig.patch Patch4: graphviz-aarch64_lib64_support.patch Patch5: graphviz-type_punning.patch +Patch6: graphviz-buffer_overflow.patch +Patch7: graphviz-proper_prototypes.patch Patch100: graphviz-plugins-fix_install_dirs.patch Patch101: graphviz-python_version.patch Patch102: graphviz-plugins-tcl_install_dir.patch @@ -262,9 +267,10 @@ Provides some additional PDF and HTML documentation for graphviz. %prep %setup -q -n %{mname}-%{version} -%patch1 %patch4 %patch5 +%patch6 +%patch7 %patch100 %patch101 %patch102 @@ -277,6 +283,7 @@ Provides some additional PDF and HTML documentation for graphviz. sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl %build +autoreconf -fi WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" CFLAGS="%{optflags} $WARN_FLAGS" %ifarch %ix86 x86_64 diff --git a/graphviz-proper_prototypes.patch b/graphviz-proper_prototypes.patch new file mode 100644 index 0000000..bf4c082 --- /dev/null +++ b/graphviz-proper_prototypes.patch @@ -0,0 +1,310 @@ +From: Philipp Thomas +Date: 2013-09-03 12:15:17+02:00 +Subject: Fix ifdef to get proper prototypes +References: +Upstream: + +--- + lib/cdt/dtclose.c | 2 +- + lib/cdt/dtdisc.c | 4 ++-- + lib/cdt/dtextract.c | 2 +- + lib/cdt/dtflatten.c | 2 +- + lib/cdt/dthash.c | 4 ++-- + lib/cdt/dtlist.c | 2 +- + lib/cdt/dtmethod.c | 2 +- + lib/cdt/dtopen.c | 2 +- + lib/cdt/dtrenew.c | 2 +- + lib/cdt/dtrestore.c | 2 +- + lib/cdt/dtsize.c | 4 ++-- + lib/cdt/dtstat.c | 6 +++--- + lib/cdt/dtstrhash.c | 2 +- + lib/cdt/dttree.c | 2 +- + lib/cdt/dttreeset.c | 4 ++-- + lib/cdt/dtview.c | 4 ++-- + lib/cdt/dtwalk.c | 2 +- + 17 files changed, 24 insertions(+), 24 deletions(-) + +Index: lib/cdt/dtclose.c +=================================================================== +--- lib/cdt/dtclose.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtclose.c 2013-09-03 12:13:04.701648435 +0200 +@@ -4,7 +4,7 @@ + ** + ** Written by Kiem-Phong Vo (05/25/96) + */ +-#if __STD_C ++#if __STDC__ + int dtclose(reg Dt_t* dt) + #else + int dtclose(dt) +Index: lib/cdt/dtdisc.c +=================================================================== +--- lib/cdt/dtdisc.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtdisc.c 2013-09-03 12:11:34.206821178 +0200 +@@ -7,7 +7,7 @@ + ** Written by Kiem-Phong Vo (5/26/96) + */ + +-#if __STD_C ++#if __STDC__ + static Void_t* dtmemory(Dt_t* dt,Void_t* addr,size_t size,Dtdisc_t* disc) + #else + static Void_t* dtmemory(dt, addr, size, disc) +@@ -27,7 +27,7 @@ Dtdisc_t* disc; /* discipline */ + else return size > 0 ? malloc(size) : NIL(Void_t*); + } + +-#if __STD_C ++#if __STDC__ + Dtdisc_t* dtdisc(Dt_t* dt, Dtdisc_t* disc, int type) + #else + Dtdisc_t* dtdisc(dt,disc,type) +Index: lib/cdt/dtextract.c +=================================================================== +--- lib/cdt/dtextract.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtextract.c 2013-09-03 12:13:07.405583542 +0200 +@@ -5,7 +5,7 @@ + ** Written by Kiem-Phong Vo (5/25/96). + */ + +-#if __STD_C ++#if __STDC__ + Dtlink_t* dtextract(reg Dt_t* dt) + #else + Dtlink_t* dtextract(dt) +Index: lib/cdt/dtflatten.c +=================================================================== +--- lib/cdt/dtflatten.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtflatten.c 2013-09-03 12:13:11.838477158 +0200 +@@ -6,7 +6,7 @@ + ** Written by Kiem-Phong Vo (5/25/96). + */ + +-#if __STD_C ++#if __STDC__ + Dtlink_t* dtflatten(Dt_t* dt) + #else + Dtlink_t* dtflatten(dt) +Index: lib/cdt/dthash.c +=================================================================== +--- lib/cdt/dthash.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dthash.c 2013-09-03 12:12:01.702160840 +0200 +@@ -9,7 +9,7 @@ + */ + + /* resize the hash table */ +-#if __STD_C ++#if __STDC__ + static void dthtab(Dt_t* dt) + #else + static void dthtab(dt) +@@ -75,7 +75,7 @@ Dt_t* dt; + } + } + +-#if __STD_C ++#if __STDC__ + static Void_t* dthash(Dt_t* dt, reg Void_t* obj, int type) + #else + static Void_t* dthash(dt,obj,type) +Index: lib/cdt/dtlist.c +=================================================================== +--- lib/cdt/dtlist.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtlist.c 2013-09-03 12:11:48.959466853 +0200 +@@ -5,7 +5,7 @@ + ** Written by Kiem-Phong Vo (05/25/96) + */ + +-#if __STD_C ++#if __STDC__ + static Void_t* dtlist(reg Dt_t* dt, reg Void_t* obj, reg int type) + #else + static Void_t* dtlist(dt, obj, type) +Index: lib/cdt/dtmethod.c +=================================================================== +--- lib/cdt/dtmethod.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtmethod.c 2013-09-03 12:13:14.998401326 +0200 +@@ -5,7 +5,7 @@ + ** Written by Kiem-Phong Vo (05/25/96) + */ + +-#if __STD_C ++#if __STDC__ + Dtmethod_t* dtmethod(Dt_t* dt, Dtmethod_t* meth) + #else + Dtmethod_t* dtmethod(dt, meth) +Index: lib/cdt/dtopen.c +=================================================================== +--- lib/cdt/dtopen.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtopen.c 2013-09-03 12:13:17.886332023 +0200 +@@ -6,7 +6,7 @@ static char* Version = "\n@(#)$Id$\0 + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + Dt_t* dtopen(Dtdisc_t* disc, Dtmethod_t* meth) + #else + Dt_t* dtopen(disc, meth) +Index: lib/cdt/dtrenew.c +=================================================================== +--- lib/cdt/dtrenew.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtrenew.c 2013-09-03 12:13:23.117206500 +0200 +@@ -6,7 +6,7 @@ + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + Void_t* dtrenew(Dt_t* dt, reg Void_t* obj) + #else + Void_t* dtrenew(dt, obj) +Index: lib/cdt/dtrestore.c +=================================================================== +--- lib/cdt/dtrestore.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtrestore.c 2013-09-03 12:13:25.885140082 +0200 +@@ -7,7 +7,7 @@ + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + int dtrestore(reg Dt_t* dt, reg Dtlink_t* list) + #else + int dtrestore(dt, list) +Index: lib/cdt/dtsize.c +=================================================================== +--- lib/cdt/dtsize.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtsize.c 2013-09-03 12:11:57.558260351 +0200 +@@ -5,7 +5,7 @@ + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + static int treecount(reg Dtlink_t* e) + #else + static int treecount(e) +@@ -14,7 +14,7 @@ reg Dtlink_t* e; + { return e ? treecount(e->left) + treecount(e->right) + 1 : 0; + } + +-#if __STD_C ++#if __STDC__ + int dtsize(Dt_t* dt) + #else + int dtsize(dt) +Index: lib/cdt/dtstat.c +=================================================================== +--- lib/cdt/dtstat.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtstat.c 2013-09-03 12:11:54.262339501 +0200 +@@ -5,7 +5,7 @@ + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + static void dttstat(Dtstat_t* ds, Dtlink_t* root, int depth, int* level) + #else + static void dttstat(ds,root,depth,level) +@@ -25,7 +25,7 @@ int* level; + level[depth] += 1; + } + +-#if __STD_C ++#if __STDC__ + static void dthstat(reg Dtdata_t* data, Dtstat_t* ds, reg int* count) + #else + static void dthstat(data, ds, count) +@@ -51,7 +51,7 @@ reg int* count; + } + } + +-#if __STD_C ++#if __STDC__ + int dtstat(reg Dt_t* dt, Dtstat_t* ds, int all) + #else + int dtstat(dt, ds, all) +Index: lib/cdt/dtstrhash.c +=================================================================== +--- lib/cdt/dtstrhash.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtstrhash.c 2013-09-03 12:13:28.373080384 +0200 +@@ -13,7 +13,7 @@ + ** Written by Kiem-Phong Vo (02/28/03) + */ + +-#if __STD_C ++#if __STDC__ + uint dtstrhash(reg uint h, Void_t* args, reg int n) + #else + uint dtstrhash(h,args,n) +Index: lib/cdt/dttree.c +=================================================================== +--- lib/cdt/dttree.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dttree.c 2013-09-03 12:13:31.517004947 +0200 +@@ -8,7 +8,7 @@ + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + static Void_t* dttree(Dt_t* dt, Void_t* obj, int type) + #else + static Void_t* dttree(dt,obj,type) +Index: lib/cdt/dttreeset.c +=================================================================== +--- lib/cdt/dttreeset.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dttreeset.c 2013-09-03 12:13:36.956874425 +0200 +@@ -5,7 +5,7 @@ + ** Written by Kiem-Phong Vo (09/17/2001) + */ + +-#if __STD_C ++#if __STDC__ + static Dtlink_t* treebalance(Dtlink_t* list, int size) + #else + static Dtlink_t* treebalance(list, size) +@@ -28,7 +28,7 @@ int size; + return mid; + } + +-#if __STD_C ++#if __STDC__ + int dttreeset(Dt_t* dt, int minp, int balance) + #else + int dttreeset(dt, minp, balance) +Index: lib/cdt/dtview.c +=================================================================== +--- lib/cdt/dtview.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtview.c 2013-09-03 12:13:40.132798226 +0200 +@@ -6,7 +6,7 @@ + */ + + +-#if __STD_C ++#if __STDC__ + static Void_t* dtvsearch(Dt_t* dt, reg Void_t* obj, reg int type) + #else + static Void_t* dtvsearch(dt,obj,type) +@@ -93,7 +93,7 @@ reg int type; + } + } + +-#if __STD_C ++#if __STDC__ + Dt_t* dtview(reg Dt_t* dt, reg Dt_t* view) + #else + Dt_t* dtview(dt,view) +Index: lib/cdt/dtwalk.c +=================================================================== +--- lib/cdt/dtwalk.c.orig 2013-08-01 19:35:15.000000000 +0200 ++++ lib/cdt/dtwalk.c 2013-09-03 12:13:42.964730282 +0200 +@@ -6,7 +6,7 @@ + ** Written by Kiem-Phong Vo (5/25/96) + */ + +-#if __STD_C ++#if __STDC__ + int dtwalk(reg Dt_t* dt, int (*userf)(Dt_t*, Void_t*, Void_t*), Void_t* data) + #else + int dtwalk(dt,userf,data) diff --git a/graphviz.changes b/graphviz.changes index 431101e..cf3dd72 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Tue Sep 3 13:55:25 CEST 2013 - pth@suse.de + +- Update to 2.32.0. Changes since 2.28.0: + 2.32.0: + - New version of xdot format, annotating gradient color schemes + - Support for reading pdf images using poppler + - Lefty/dotty/lneato now accept anonymous graphs + - Add star node shape + - Add two-tone (non-gradient) fill + 2.30.1: + - various build fixes + 2.30.0: + - Replaced libgraph with libcgraph; use of libgraph is now deprecated + - New ranking algorithm that allows multiple subgraph constraints + - Support edges using curved arcs. + - Added new shapes used by the synthetic biology community. + - For HTML-like labels, provide rounded cells, and dashed or dotted borders. + - Add lcurve and rcurve arrowheads. + - Add prototype pie chart and striped fills. + - Support insets in treemaps to make containment clear + - Add random rooted tree generation to gvgen + - Allow GVPRPATH to specify that the default path be prepended or + appended to it. + - Support arbitrary lists of layers; allow the user to specify arbitrary + layers for output. + - A collection of gvpr scripts, which were part of the source package, + are now installed in /share/graphviz/gvpr, and the that path + is used as part of th default built-in path for gvpr. + - Update libexpr to reflect Glenn Fowler's changes including scopes for + variables. + - Add next graph variable to gvpr + - Modify dot and fdp so that a cluster's margin attribute will affect + the space between the bounding box and nodes + - Modify the dijkstra tool to use only directed edges + - Output numbers without quotes if quotes are not needed on input + - Support gradient fill + - Provide support for webp images + - Fix tapered edges to use the dir attribute and arrowhead + - Add imagepath attribute + - Add help functionality to Graphviz.app + - Add ,, to html strings via svg + - Add tapered edges + - Add support for external labels + - Add initial implementation of graphml2gv + - Add basic horizontal and vertical rules to html tables + +- Remove graphviz-gd_png_check_sig.patch as the file to patch doesn't + exist anymore. +- Add graphviz-buffer_overflow.patch to fix a buffer ovderflow in + lib/common/shapes.c(round_corners). +- Add graphviz-proper_prototypes.patch that changes the conditional + from __STD_C to the standard conforming __STDC__ to get proper + prototypes. +- Run autoreconf to use -fno-strict-aliasing for libvmalloc sources + ------------------------------------------------------------------- Thu Mar 28 11:51:09 CET 2013 - pth@suse.de diff --git a/graphviz.spec b/graphviz.spec index 6646e82..3375056 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -20,7 +20,7 @@ %define config_file config6 Name: graphviz -Version: 2.28.0 +Version: 2.32.0 Release: 0 Summary: Graph Visualization Tools License: IPL-1.0 @@ -28,20 +28,25 @@ Group: Productivity/Graphics/Visualization/Graph Url: http://www.graphviz.org/ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz Source2: graphviz-rpmlintrc -Patch1: graphviz-gd_png_check_sig.patch Patch2: graphviz-fix-pkgIndex.patch Patch3: graphviz-missing_headers.patch Patch4: graphviz-aarch64_lib64_support.patch Patch5: graphviz-type_punning.patch +Patch6: graphviz-buffer_overflow.patch +Patch7: graphviz-proper_prototypes.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: bison BuildRequires: fdupes BuildRequires: flex +BuildRequires: freeglut-devel BuildRequires: freetype2-devel >= 2 BuildRequires: gcc-c++ BuildRequires: libXaw-devel BuildRequires: libexpat-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel +BuildRequires: libqt4-devel BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: zlib-devel @@ -87,16 +92,18 @@ Note: If you need output in png format you also need to install %prep %setup -q -%patch1 %patch2 %patch3 -p1 %patch4 %patch5 +%patch6 +%patch7 # Fix path in generated man pages sed -e 's$@LIB_DIR@$%{_libdir}$g' tclpkg/gv/gv_doc_langs.tcl >tclpkg/gv/gv_doc_langs.tcl.new && mv tclpkg/gv/gv_doc_langs.tcl.new tclpkg/gv/gv_doc_langs.tcl %build +autoreconf -fi WARN_FLAGS="-W -Wall -Wno-unused-parameter -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith" CFLAGS="%{optflags} $WARN_FLAGS" %ifarch %ix86 x86_64 @@ -164,7 +171,7 @@ rm -f %{_libdir}/graphviz/libgvplugin_gtk* %post /sbin/ldconfig -# run "dot -c" to generate plugin config %{_libdir}/graphviz/config +# run "dot -c" to generate plugin config %%{_libdir}/graphviz/config dot -c test -s %{_libdir}/graphviz/%{config_file} || echo "%{_libdir}/graphviz/%{config_file} doesn't exist! Check installation." @@ -179,6 +186,40 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li %dir %{_datadir}/%{name} %{_datadir}/%{name}/lefty %{_datadir}/%{name}/graphs +%dir %{_datadir}/%{name}/gvpr +%{_datadir}/%{name}/gvpr/addranks +%{_datadir}/%{name}/gvpr/addrings +%{_datadir}/%{name}/gvpr/anon +%{_datadir}/%{name}/gvpr/attr +%{_datadir}/%{name}/gvpr/bb +%{_datadir}/%{name}/gvpr/bbox +%{_datadir}/%{name}/gvpr/cliptree +%{_datadir}/%{name}/gvpr/col +%{_datadir}/%{name}/gvpr/collapse +%{_datadir}/%{name}/gvpr/color +%{_datadir}/%{name}/gvpr/dechain +%{_datadir}/%{name}/gvpr/deghist +%{_datadir}/%{name}/gvpr/deledges +%{_datadir}/%{name}/gvpr/delmulti +%{_datadir}/%{name}/gvpr/delnodes +%{_datadir}/%{name}/gvpr/depath +%{_datadir}/%{name}/gvpr/dijkstra +%{_datadir}/%{name}/gvpr/flatten +%{_datadir}/%{name}/gvpr/get-layers-list +%{_datadir}/%{name}/gvpr/group +%{_datadir}/%{name}/gvpr/indent +%{_datadir}/%{name}/gvpr/knbhd +%{_datadir}/%{name}/gvpr/maxdeg +%{_datadir}/%{name}/gvpr/path +%{_datadir}/%{name}/gvpr/rotate +%{_datadir}/%{name}/gvpr/scale +%{_datadir}/%{name}/gvpr/scalexy +%{_datadir}/%{name}/gvpr/span +%{_datadir}/%{name}/gvpr/topon +%{_datadir}/%{name}/gvpr/treetoclust +%dir %{_datadir}/%{name}/gvedit +%{_datadir}/%{name}/gvedit/attrs.txt + %doc %{_mandir}/man1/*.1* %doc %{_mandir}/man7/*.7* %dir %{_libdir}/%{name}