OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/graphviz?expand=0&rev=23

graphviz-2.18-do_not_use_ocamlopt.patch

@@ -1,6 +1,6 @@
 --- tclpkg/gv/Makefile.am
 +++ tclpkg/gv/Makefile.am
-@@ -73,9 +73,9 @@
+@@ -79,9 +79,9 @@
  
  pkgocamldir = $(pkglibdir)/ocaml
  OCAML_data = gv.cmo gv.cma gv.cmi gv.mli META.gv

graphviz-2.18-duplicate_decls.patch

@@ -1,22 +0,0 @@
---- tclpkg/gv/gv.i
-+++ tclpkg/gv/gv.i
-@@ -144,19 +144,6 @@
- 
- extern Agsym_t *firstattr(Agedge_t *e);
- extern Agsym_t *nextattr(Agedge_t *e, Agsym_t *a);
--
--/* remove graph objects */
--extern void rm(Agraph_t *g);
--extern void rm(Agnode_t *n);
--extern void rm(Agedge_t *e);
--
--extern void layout(Agraph_t *g, char *engine);
--
--extern void render(Agraph_t *g, char *format);
--extern void render(Agraph_t *g, char *format, char *filename);
--extern void render(Agraph_t *g, char *format, FILE *f);
--extern void render(Agraph_t *g, char *format, void **data);
--
- %}
- 
- %inline %{

graphviz-2.18.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff6547494df59d25c27486686897114bcf26a5c7f519fb7c813ee932c289a2fa
-size 11214186

graphviz-2.20.2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ac17ec5b417feb781e611ab83fe644d93147b41921e3a92062f931f79484e64c
+size 11233143

graphviz-aliasing-fixes.patch

@@ -1,65 +0,0 @@
---- lib/agraph/edge.c
-+++ lib/agraph/edge.c
-@@ -149,28 +149,29 @@
- 
- void agedgesetop(Agraph_t * g, Agedge_t * e, int ins)
- {
--    Dtlink_t **seq_set, **id_set;
-+    union {
-+	Dtlink_t **dtlink;
-+	Agedge_t **agedge;
-+    } seq_set;
-+    Dtlink_t **id_set;
-     Agnode_t *n;		/* node where <e> is referenced */
--    Agedge_t **tmp;		
- 
-     if (AGTYPE(e) == AGOUTEDGE) {
- 	n = AGOUT2IN(e)->node;
--	tmp = &(n->out); /* avoiding - "dereferencing type-punned pointer will break strict-aliasing rules" */
--	seq_set = (Dtlink_t **)tmp;
-+	seq_set.agedge = &(n->out);
- 	id_set = &(n->outid);
-     } else {
- 	n = AGIN2OUT(e)->node;
--	tmp = &(n->in);  
--	seq_set = (Dtlink_t **)tmp;
-+	seq_set.agedge = &(n->in);
- 	id_set = &(n->inid);
-     }
- 
--    dtrestore(g->e_seq, *seq_set);
-+    dtrestore(g->e_seq, *seq_set.dtlink);
-     if (ins)
- 	dtinsert(g->e_seq, e);
-     else
- 	dtdelete(g->e_seq, e);
--    *seq_set = dtextract(g->e_seq);
-+    *seq_set.dtlink = dtextract(g->e_seq);
- 
-     dtrestore(g->e_id, *id_set);
-     if (ins)
---- lib/agraph/flatten.c
-+++ lib/agraph/flatten.c
-@@ -26,13 +26,17 @@
- 
- void agflatten_edges(Agraph_t * g, Agnode_t * n)
- {
--    Agedge_t **tmp;
- 
--    tmp = &(n->out); /* avoiding - "dereferencing type-punned pointer will break strict-aliasing rules" */
-+    union {
-+    	Dtlink_t **dtlink;
-+    	Agedge_t **agedge;
-+	} out, in;
-+
-+    out.agedge = & (n->out);
-+    in.agedge = & (n->in);
-+    agflatten_elist(g->e_seq, out.dtlink);
-+    agflatten_elist(g->e_seq, in.dtlink);
- 
--    agflatten_elist(g->e_seq, (Dtlink_t **) tmp);
--    tmp = &(n->in);
--    agflatten_elist(g->e_seq, (Dtlink_t **) tmp);
- }
- 
- void agflatten(Agraph_t * g, int flag)

graphviz-codecleanup.patch

@@ -1,11 +0,0 @@
---- lib/sfio/sfhdr.h
-+++ lib/sfio/sfhdr.h
-@@ -493,7 +493,7 @@
- 	    if((lv = localeconv())) \
- 	    { if(lv->decimal_point && lv->decimal_point[0]) \
- 	    	*(decimal) = lv->decimal_point[0]; \
--	      if(thousand && lv->thousands_sep && lv->thousands_sep[0]) \
-+	      if(thousand != NULL && lv->thousands_sep && lv->thousands_sep[0]) \
- 	    	*(thousand) = lv->thousands_sep[0]; \
- 	    } \
- 	  } \

graphviz-configure_grok_vars.patch

@@ -1,31 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -9,21 +9,23 @@
- dnl ===========================================================================
- 
- # libtool shared library version for main libs (cdt, graph, gvc)
-+#Make m4 grok these VARIABLES
-+m4_pattern_allow([^LT_(CURRENT|REVISION|AGE)$])
- 
- # Increment if the interface has additions, changes, removals.
--#LT_CURRENT=4
-+LT_CURRENT=4
- 
- # Increment any time the source changes; set to
- # 0 if you increment CURRENT
--#LT_REVISION=0
-+LT_REVISION=0
- 
- # Increment if any interfaces have been added; set to 0
- # if any interfaces have been removed. removal has
- # precedence over adding, so set to 0 if both happened.
--#LT_AGE=0
-+LT_AGE=0
- 
--#VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
--VERSION_INFO="4:0:0"
-+VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
-+#VERSION_INFO="4:0:0"
- AC_SUBST(VERSION_INFO)
- dnl ===========================================================================
- 

graphviz-dot_verify_plugins.patch

@@ -1,111 +0,0 @@
---- lib/gvc/gvconfig.c	14 Apr 2008 16:35:16 -0000	1.83
-+++ lib/gvc/gvconfig.c	16 Apr 2008 17:35:52 -0000	1.84
-@@ -248,14 +248,9 @@
-     for (apis = library->apis; (types = apis->types); apis++) {
-         fprintf(f, "\t%s {\n", gvplugin_api_name(apis->api));
- 	for (i = 0; types[i].type; i++) {
--#if 0
--/* this was a good idea, but fails because we need a config to load
-- * by plugin name, and were still generating the config.
-- */
- 	    /* verify that dependencies are available */
-             if (! (gvplugin_load(gvc, apis->api, types[i].type)))
- 		fprintf(f, "#FAILS");
--#endif
- 	    fprintf(f, "\t\t%s %d\n", types[i].type, types[i].quality);
- 	}
- 	fputs ("\t}\n", f);
-@@ -408,6 +403,15 @@
- 		library = gvplugin_library_load(gvc, globbuf.gl_pathv[i]);
- 		if (library) {
- 		    gvconfig_plugin_install_from_library(gvc, globbuf.gl_pathv[i], library);
-+		}
-+	    }
-+	}
-+	/* rescan with all libs loaded to check cross dependencies */
-+	for (i = 0; i < globbuf.gl_pathc; i++) {
-+	    re_status = regexec(&re, globbuf.gl_pathv[i], (size_t) 0, NULL, 0);
-+	    if (re_status == 0) {
-+		library = gvplugin_library_load(gvc, globbuf.gl_pathv[i]);
-+		if (library) {
- 		    path = strrchr(globbuf.gl_pathv[i],DIRSEP[0]);
- 		    if (path)
- 			path++;
-@@ -492,8 +496,8 @@
-         libdir = gvconfig_libdir();
-         rc = stat(libdir, &libdir_st);
-         if (rc == -1) {
--    	/* if we fail to stat it then it probably doesn't exist so just fail silently */
--    	return;
-+    	    /* if we fail to stat it then it probably doesn't exist so just fail silently */
-+	    return;
-         }
-     
-         if (! gvc->config_path) {
-@@ -504,42 +508,43 @@
-         }
-     	
-         if (rescan) {
--    	config_rescan(gvc, gvc->config_path);
--    	gvc->config_found = TRUE;
--    	return;
-+    	    config_rescan(gvc, gvc->config_path);
-+    	    gvc->config_found = TRUE;
-+    	    return;
-         }
-     
-         /* load in the cached plugin library data */
-     
-         rc = stat(gvc->config_path, &config_st);
-         if (rc == -1) {
--    	/* silently return without setting gvc->config_found = TRUE */
--    	return;
-+    	    /* silently return without setting gvc->config_found = TRUE */
-+    	    return;
-         }
-         else if (config_st.st_size > MAX_SZ_CONFIG) {
--    	agerr(AGERR,"%s is bigger than I can handle.\n", gvc->config_path);
-+    	    agerr(AGERR,"%s is bigger than I can handle.\n", gvc->config_path);
-         }
-         else {
--    	f = fopen(gvc->config_path,"r");
--    	if (!f) {
--    	    agerr (AGERR,"failed to open %s for read.\n", gvc->config_path);
--    	}
--    	else {
--    	    config_text = gmalloc(config_st.st_size + 1);
--    	    sz = fread(config_text, 1, config_st.st_size, f);
--    	    if (sz == 0) {
--    		agerr(AGERR,"%s is zero sized, or other read error.\n", gvc->config_path);
--    		free(config_text);
-+    	    f = fopen(gvc->config_path,"r");
-+    	    if (!f) {
-+    	        agerr (AGERR,"failed to open %s for read.\n", gvc->config_path);
-     	    }
-     	    else {
--    	        gvc->config_found = TRUE;
--    	        config_text[sz] = '\0';  /* make input into a null terminated string */
--    	        rc = gvconfig_plugin_install_from_config(gvc, config_text);
--    		/* NB. config_text not freed because we retain char* into it */
-+    	        config_text = gmalloc(config_st.st_size + 1);
-+    	        sz = fread(config_text, 1, config_st.st_size, f);
-+    	        if (sz == 0) {
-+    		    agerr(AGERR,"%s is zero sized, or other read error.\n", gvc->config_path);
-+    		    free(config_text);
-+    	        }
-+    	        else {
-+    	            gvc->config_found = TRUE;
-+    	            config_text[sz] = '\0';  /* make input into a null terminated string */
-+    	            rc = gvconfig_plugin_install_from_config(gvc, config_text);
-+    		    /* NB. config_text not freed because we retain char* into it */
-+    	        }
-     	    }
--    	}
--    	if (f)
--    	    fclose(f);
-+    	    if (f) {
-+    	        fclose(f);
-+	    }
-         }
-     }
- #endif

graphviz-fix-pkgIndex.patch

@@ -1,14 +1,5 @@
 --- tclpkg/mkpkgindex.sh
 +++ tclpkg/mkpkgindex.sh
-@@ -4,7 +4,7 @@
- # $2 = Name of extension
- # $3 = Version of extension
- 
--lib=`sed -n "/library_names/s/^[^']*'\([^ ']*\).*$/\1/p" $1`
-+lib=`sed -n "/dlname/s/^[^']*'\([^ ']*\).*$/\1/p" $1`
- if [ -z "$lib" ]
- then
-     libBaseName=`basename $1 .la`
 @@ -22,4 +22,4 @@
      echo "	package require Tk 8.3" >>pkgIndex.tcl
      ;;

graphviz-fix_manpages.patch

@@ -1,51 +0,0 @@
---- tclpkg/gv/gv_doc_langs.tcl
-+++ tclpkg/gv/gv_doc_langs.tcl
-@@ -155,7 +155,7 @@
- 		}
- 		SYNOPSIS {
- 			{#!/usr/bin/lua}
--			{lib=loadlib('/usr/lib/graphviz/lua/libgv_lua.so','Gv_Init')}
-+			{lib=loadlib('@LIB_DIR@/graphviz/lua/libgv_lua.so','Gv_Init')}
- 			{assert(lib)()}
- 		}
- 		USAGE {
-@@ -236,7 +236,7 @@
- 		}
- 		SYNOPSIS {
- 			{#!/usr/bin/perl}
--			{use lib "/usr/lib/graphviz/perl"}
-+			{use lib "@LIB_DIR@/graphviz/perl"}
- 			{use gv;}
- 		}
- 		USAGE {
-@@ -320,7 +320,7 @@
- 		SYNOPSIS {
- 			{#!/usr/bin/python}
- 			{import sys}
--			{sys.path.append('/usr/lib/graphviz/python')}
-+			{sys.path.append('@LIB_DIR@/graphviz/python')}
- 			{import gv}
- 		}
- 		USAGE {
-@@ -361,7 +361,7 @@
- 			Gv.  (  {, }   {);}
- 		}
- 		SYNOPSIS {
--			{export RUBYLIB=/usr/lib/graphviz/ruby}
-+			{export RUBYLIB=@LIB_DIR@/graphviz/ruby}
- 			{}
- 			{#!/usr/bin/ruby}
- 			{require 'gv'}
-@@ -405,10 +405,10 @@
- 		}
- 		SYNOPSIS {
- 			{#!/usr/bin/tclsh}
--			{load /usr/lib/graphviz/tcl/gv.so}
-+			{package require gv}
- 		}
- 		USAGE {
--			{Requires tcl7.6 or later.}
-+			{Requires tcl8.3 or later.}
- 		}
- 	}
- }

graphviz-fix_swig_template.patch

@@ -1,137 +0,0 @@
---- tclpkg/gv/gv.i
-+++ tclpkg/gv/gv.i
-@@ -24,6 +24,134 @@
- #undef PACKAGE_NAME
- 
- #include "gvc.h"
-+
-+/* new graph objects */
-+extern Agraph_t *graph(char *name);		/* new empty graph */
-+extern Agraph_t *digraph(char *name);		/* new empty digraph */
-+extern Agraph_t *strictgraph(char *name);	/* new empty strict graph */
-+extern Agraph_t *strictdigraph(char *name);	/* new empty strict digraph */
-+
-+extern Agraph_t *readstring(char *string);	/* from dot-formatted string */
-+extern Agraph_t *read(char *filename);		/* from dot-formatted file */
-+extern Agraph_t *read(FILE *f);			/* from dot-formatted file */
-+
-+extern Agraph_t *graph(Agraph_t *g, char *name);/* add subgraph to graph */
-+extern Agnode_t *node(Agraph_t *g, char *name);	/* add node to graph */
-+extern Agedge_t *edge(Agnode_t *t, Agnode_t *h);/* add edge between existing nodes */
-+				
-+extern Agedge_t *edge(Agnode_t *t, char *hname);/* add edge, existing tail, named head which will be induced if necessary */
-+extern Agedge_t *edge(char *tname, Agnode_t *h);/* add edge, named tail which will be induced if necessary, existing head */
-+
-+extern Agedge_t *edge(Agraph_t *g, char *tname, char *hname);/* add edge between named nodes, induced as necessary */
-+
-+/* set/get attribute of graph/node/edge */
-+extern char *setv(Agraph_t *g, char *attr, char *val);
-+extern char *setv(Agraph_t *g, char *gne, char *att, char *val);
-+extern char *setv(Agnode_t *n, char *attr, char *val);
-+extern char *setv(Agedge_t *e, char *attr, char *val);
-+
-+extern char *setv(Agraph_t *g, Agsym_t *a, char *val);
-+extern char *setv(Agraph_t *g, char *gne, Agsym_t *a, char *val);
-+extern char *setv(Agnode_t *n, Agsym_t *a, char *val);
-+extern char *setv(Agedge_t *e, Agsym_t *a, char *val);
-+
-+extern char *getv(Agraph_t *g, char *attr);
-+extern char *getv(Agraph_t *g, char *gne, char *attr);
-+extern char *getv(Agnode_t *n, char *attr);
-+extern char *getv(Agedge_t *e, char *attr);
-+
-+extern char *getv(Agraph_t *g, Agsym_t *a);
-+extern char *getv(Agraph_t *g, char *gne, Agsym_t *a);
-+extern char *getv(Agnode_t *n, Agsym_t *a);
-+extern char *getv(Agedge_t *e, Agsym_t *a);
-+
-+/* names */
-+extern char *nameof(Agraph_t *g);
-+extern char *nameof(Agnode_t *n);
-+//extern char *nameof(Agedge_t *e);
-+extern char *nameof(Agsym_t *a);
-+
-+extern Agraph_t *findsubg(Agraph_t *g, char *name);
-+extern Agnode_t *findnode(Agraph_t *g, char *name);
-+extern Agedge_t *findedge(Agnode_t *t, Agnode_t *h);
-+
-+extern Agsym_t *findattr(Agraph_t *g, char *name);
-+extern Agsym_t *findattr(Agnode_t *n, char *name);
-+extern Agsym_t *findattr(Agedge_t *e, char *name);
-+
-+/* misc navigators */
-+extern Agnode_t *headof(Agedge_t *e);
-+extern Agnode_t *tailof(Agedge_t *e);
-+extern Agraph_t *graphof(Agraph_t *g);
-+extern Agraph_t *graphof(Agedge_t *e);
-+extern Agraph_t *graphof(Agnode_t *n);
-+extern Agraph_t *rootof(Agraph_t *g);
-+
-+/* iterators */
-+extern bool ok(Agraph_t *g);
-+extern bool ok(Agnode_t *n);
-+extern bool ok(Agedge_t *e);
-+extern bool ok(Agsym_t *a);
-+
-+extern Agraph_t *firstsubg(Agraph_t *g);
-+extern Agraph_t *nextsubg(Agraph_t *g, Agraph_t *sg);
-+
-+extern Agraph_t *firstsupg(Agraph_t *g);
-+extern Agraph_t *nextsupg(Agraph_t *g, Agraph_t *sg);
-+
-+extern Agedge_t *firstedge(Agraph_t *g);
-+extern Agedge_t *nextedge(Agraph_t *g, Agedge_t *e);
-+
-+extern Agedge_t *firstout(Agraph_t *g);
-+extern Agedge_t *nextout(Agraph_t *g, Agedge_t *e);
-+
-+extern Agedge_t *firstedge(Agnode_t *n);
-+extern Agedge_t *nextedge(Agnode_t *n, Agedge_t *e);
-+
-+extern Agedge_t *firstout(Agnode_t *n);
-+extern Agedge_t *nextout(Agnode_t *n, Agedge_t *e);
-+
-+extern Agnode_t *firsthead(Agnode_t *n);
-+extern Agnode_t *nexthead(Agnode_t *n, Agnode_t *h);
-+
-+extern Agedge_t *firstin(Agraph_t *g);
-+extern Agedge_t *nextin(Agnode_t *n, Agedge_t *e);
-+
-+extern Agedge_t *firstin(Agnode_t *n);
-+extern Agedge_t *nextin(Agraph_t *g, Agedge_t *e);
-+
-+extern Agnode_t *firsttail(Agnode_t *n);
-+extern Agnode_t *nexttail(Agnode_t *n, Agnode_t *t);
-+
-+extern Agnode_t *firstnode(Agraph_t *g);
-+extern Agnode_t *nextnode(Agraph_t *g, Agnode_t *n);
-+
-+extern Agnode_t *firstnode(Agedge_t *e);
-+extern Agnode_t *nextnode(Agedge_t *e, Agnode_t *n);
-+
-+extern Agsym_t *firstattr(Agraph_t *g);
-+extern Agsym_t *firstattr(Agraph_t *g, char *gne);
-+extern Agsym_t *nextattr(Agraph_t *g, Agsym_t *a);
-+extern Agsym_t *nextattr(Agraph_t *g, char *gne, Agsym_t *a);
-+
-+extern Agsym_t *firstattr(Agnode_t *n);
-+extern Agsym_t *nextattr(Agnode_t *n, Agsym_t *a);
-+
-+extern Agsym_t *firstattr(Agedge_t *e);
-+extern Agsym_t *nextattr(Agedge_t *e, Agsym_t *a);
-+
-+/* remove graph objects */
-+extern void rm(Agraph_t *g);
-+extern void rm(Agnode_t *n);
-+extern void rm(Agedge_t *e);
-+
-+extern void layout(Agraph_t *g, char *engine);
-+
-+extern void render(Agraph_t *g, char *format);
-+extern void render(Agraph_t *g, char *format, char *filename);
-+extern void render(Agraph_t *g, char *format, FILE *f);
-+extern void render(Agraph_t *g, char *format, void **data);
-+
- %}
- 
- %inline %{

graphviz-missing_includes.patch

@@ -1,21 +0,0 @@
---- lib/vpsc/csolve_VPSC.cpp
-+++ lib/vpsc/csolve_VPSC.cpp
-@@ -21,7 +21,9 @@
- #include <generate-constraints.h>
- #include <solve_VPSC.h>
- #include <cassert>
-+#include <cstdlib>
- #include "csolve_VPSC.h"
-+
- extern "C" {
- Variable* newVariable(int id, double desiredPos, double weight) {
- 	return new Variable(id,desiredPos,weight);
-@@ -79,7 +81,7 @@
- 		vpsc->satisfy();
- 	} catch(const char *e) {
- 		std::cerr << e << std::endl;
--		exit(1);
-+		std::exit(1);
- 	}
- }
- int getSplitCnt(IncVPSC *vpsc) {

graphviz-no_strict_aliasing.patch

@@ -1,38 +0,0 @@
-Switch off strict-aliasing until swig is fixed to produce code that doesn't
-break the rules.
-
-================================================================================
---- tclpkg/gv/Makefile.am
-+++ tclpkg/gv/Makefile.am
-@@ -66,6 +66,7 @@
- libgv_lua_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
- libgv_lua_la_LIBADD = $(BASELIBS) @LUA_LIBS@
- libgv_lua_la_LDFLAGS = -module -avoid-version
-+libgv_lua_la_CXXFLAGS = -fno-strict-aliasing
- $(LUA_data): gv_lua.cpp
- gv_lua.cpp: gv.i
- 	$(SWIG) -c++ -lua -o gv_lua.cpp $(srcdir)/gv.i
-@@ -78,6 +79,7 @@
- nodist_libgv_ocaml_la_SOURCES = gv_ocaml.cpp $(OCAML_data)
- libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
- libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@
-+libgv_ocaml_la_CXXFLAGS = -fno-strict-aliasing
- libgv_ocaml_la_LDFLAGS = -module -avoid-version
- gv.ml gv.mli: gv_ocaml.cpp
- gv_ocaml.cpp: gv.i
-@@ -106,6 +108,7 @@
- PERL_data = gv.pm
- nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_data)
- libgv_perl_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp
-+libgv_perl_la_CXXFLAGS = -fno-strict-aliasing
- libgv_perl_la_LIBADD = $(BASELIBS) @PERL_LIBS@
- libgv_perl_la_LDFLAGS = -module -avoid-version
- $(PERL_data): gv_perl.cpp
-@@ -117,6 +120,7 @@
- nodist_libgv_php_la_SOURCES = gv_php.cpp php_gv.h
- libgv_php_la_SOURCES = $(BASESOURCES) gv_php_init.cpp
- libgv_php_la_LIBADD = $(BASELIBS) @PHP_LIBS@
-+libgv_php_la_CXXFLAGS = -fno-strict-aliasing
- libgv_php_la_LDFLAGS = -module -avoid-version
- gv.php: gv_php.cpp
- php_gv.h: gv_php.cpp

graphviz-plugins-fix_install_dirs.patch

@@ -1,35 +1,22 @@
 --- configure.ac
 +++ configure.ac
-@@ -272,7 +272,7 @@
+@@ -958,8 +958,8 @@
- fi
- 
- dnl -----------------------------------
--dnl Check for various typedefs and provide substitutes if they don't exist.
-+dnl Check for various typedefs and provide substitutes if they do not exist.
-                                                                                 
- AC_C_CONST
- AC_TYPE_MODE_T
-@@ -821,11 +821,13 @@
- AC_CHECK_PROG(PHP,php,php)
- if test -d /usr/include/php5; then
- PHP_INCLUDES="-I/usr/include/php5 -I/usr/include/php5/main -I/usr/include/php5/Zend -I/usr/include/php5/TSRM"
-+PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php5/extensions"
-+PHP_INSTALL_DATADIR="/usr/share/php5"
          else
            PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
--fi
+         fi
- PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules"
+-        PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules"
- PHP_INSTALL_DATADIR="/usr/share/php"
+-        PHP_INSTALL_DATADIR="/usr/share/php"
-+fi
++        PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php5/extensions"
++        PHP_INSTALL_DATADIR="/usr/share/php5"
          PHP_LIBS=
          save_CPPFLAGS=$CPPFLAGS
          CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
-@@ -1203,7 +1205,7 @@
+@@ -1391,7 +1391,7 @@
      AC_MSG_WARN([Unable to find tclConfig.sh. The Tcl packages will not be built])
-         HAVE_TCL=0
+     use_tcl="No (missing tclConfig.sh)"
    fi
 -  TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}"
 +  TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}"
  fi
  
- if test "$HAVE_TCL" = "1"; then
+ if test "x$use_tcl" = "x"; then

graphviz-plugins.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Thu Jul 10 12:11:47 CEST 2008 - pth@suse.de
+
+- Update to 2.20.2. Changes since 2.18:
+
+  2.20.2:
+  - Fix bug in HTML-like labels
+
+  2.20.1:
+  - Fix bug in ccomps related to conversion to cgraph
+
+  2.20.0:
+  - Fixed bugs (see http://www.graphviz.org/bugs/buglist.html for
+    details: 
+    - 1315: Different/error output for *.os and *.pdf
+    - 1317: Graphviz fails to open more than 512 files.
+    - 1324: Graphviz crashes in atexit().
+    - 1336: Plain format label delimiters change randomly.
+    - 1343: Layouts other than 'dot' seem broken in tcldot due to
+            documentation error.
+    - 1364: Dot fails with failed assertion.
+  - Add new "folder" shape for nodes.
+  - Migration of gvpr tools to libcgraph.
+  - New output format -Teps  (encapsulated postscript)
+  - Various NetBSD and SuSE fixes incorporated
+  - ./configure now provides a summary
+
 -------------------------------------------------------------------
 Tue Apr 29 19:30:23 CEST 2008 - pth@suse.de
 

graphviz-plugins.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package graphviz-plugins (Version 2.18)
+# spec file for package graphviz-plugins (Version 2.20.2)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -23,31 +23,20 @@ BuildRequires:  graphviz gtkglext-devel libglade2-devel libgnomeui-devel
 %if 0%{?suse_version} > 1020
 BuildRequires:  fdupes
 %endif
-Version:        2.18
+Version:        2.20.2
-Release:        8
+Release:        1
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
 Source:         http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.bz2
 #Source1:        %{name}-rpmlintrc
 Patch0:         graphviz-fix-pkgIndex.patch
-Patch1:         graphviz-aliasing-fixes.patch
-Patch2:         graphviz-fix_swig_template.patch
 Patch3:         graphviz-neato_splines.patch
-Patch4:         graphviz-strcmp_fix.patch
-Patch5:         graphviz-fix_manpages.patch
-Patch7:         graphviz-codecleanup.patch
-Patch8:         graphviz-missing_includes.patch
-Patch9:         graphviz-configure_grok_vars.patch
-Patch10:        graphviz-2.18-duplicate_decls.patch
 Patch11:        graphviz-%{version}-interpreter_names.patch
-#Patch from CVS, will be obsolete with next release after 2.18
-Patch12:        graphviz-dot_verify_plugins.patch
 Patch13:        graphviz-stddefs.patch
 #Patches above 100 are graphviz-plugins specific.
 Patch100:       graphviz-plugins-fix_install_dirs.patch
 Patch101:       graphviz-plugins-tcl_install_dir.patch
-Patch102:       graphviz-no_strict_aliasing.patch
 Patch103:       graphviz-2.18-do_not_use_ocamlopt.patch
 Url:            http://www.graphviz.org/
 License:        IBM Public License
@@ -57,6 +46,7 @@ PreReq:         /bin/cat
 %define rb_libdir    %{_libdir}/ruby
 %define rb_sitedir   %{rb_libdir}/site_ruby/%{rb_ver}
 %define rb_vendordir %{rb_libdir}/vendor_ruby/%{rb_ver}
+%define lua_libdir %{_libdir}/lua/%(pkg-config --variable=V lua)
 
 %description
 A collection of tools and tcl packages for the manipulation and layout
@@ -362,21 +352,11 @@ Authors:
 %prep
 %setup -q -n %{mname}-%{version}
 %patch
-%patch1
-%patch2
 %patch3
-%patch4
-%patch5
-%patch7
-%patch8
-%patch9
-%patch10
 %patch11
-%patch12
 %patch13
 %patch100
 %patch101
-%patch102
 %patch103
 # 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
@@ -397,24 +377,17 @@ RANLIB=:
 export CC RANLIB
 export CFLAGS="$CFLAGS"
 export CPPFLAGS="%optflags"
-./configure \
+%configure \
-      --prefix=%{_prefix} \
-      --bindir=%{_bindir} \
-      --libdir=%{_libdir} \
-      --includedir=%{_includedir} \
-      --datadir=%{_datadir} \
-      --mandir=%{_mandir} \
       --with-x \
       --disable-static \
       --disable-dependency-tracking \
       --with-ipsepcola \
       --without-ming \
       --disable-io
-make DESTDIR=%buildroot
+%{__make} DESTDIR=%buildroot  %{?jobs:-j%jobs}
 
 %install
-make install \
+%makeinstall \
-	DESTDIR=%{buildroot} \
 	docdir=%{buildroot}%{_docdir}/%{mname} \
 	pkgconfigdir=%{_libdir}/pkgconfig
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
@@ -449,10 +422,11 @@ for lib in libgdtclft* libgv_tcl.so libtcldot* libtclplan* libtkspline*; do
    mv %{buildroot}%{_libdir}/%{mname}/tcl/${lib} %{buildroot}%{_libdir}
 done
 %if 0%{?suse_version} > 1020
-%fdupes -s %{buildroot}%{_docdir}
+%fdupes -s %{buildroot}%{_defaultdocdir}/%{mname}
 %endif
 #%clean
 #rm -rf %{buildroot}
+%{__rm} -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib}
 
 %files -n graphviz-gd
 %defattr(-,root,root)
@@ -494,7 +468,10 @@ done
 %files -n graphviz-lua
 %defattr(-,root,root,-)
 %{_datadir}/%{mname}/demo/modgraph.lua
+%dir %{_libdir}/lua
+%dir %lua_libdir
 %{_libdir}/graphviz/lua
+%{lua_libdir}/gv.so
 %doc %{_mandir}/mann/gv_lua.n.gz
 
 %files -n graphviz-ocaml
@@ -515,7 +492,6 @@ done
 %{_libdir}/php5/extensions/gv.so
 %{_datadir}/php5/gv.php
 %doc %{_mandir}/mann/gv_php.n.gz
-%{_libdir}/%{mname}-%{version}
 %dir %{_libdir}/%{mname}/php
 %{_libdir}/%{mname}/php/gv.php
 %{_libdir}/%{mname}/php/gv.so
@@ -563,11 +539,32 @@ done
 %exclude %{_datadir}/%{mname}/demo/modgraph.pl
 
 %files -n graphviz-doc
-%docdir %{_defaultdocdir}/%{mname}
 %defattr(-,root,root,-)
+%docdir %{_defaultdocdir}/%{mname}
 %doc __doc/*
 
 %changelog
+* Thu Jul 10 2008 pth@suse.de
+- Update to 2.20.2. Changes since 2.18:
+  2.20.2:
+  - Fix bug in HTML-like labels
+  2.20.1:
+  - Fix bug in ccomps related to conversion to cgraph
+  2.20.0:
+  - Fixed bugs (see http://www.graphviz.org/bugs/buglist.html for
+  details:
+    - 1315: Different/error output for *.os and *.pdf
+    - 1317: Graphviz fails to open more than 512 files.
+    - 1324: Graphviz crashes in atexit().
+    - 1336: Plain format label delimiters change randomly.
+    - 1343: Layouts other than 'dot' seem broken in tcldot due to
+  documentation error.
+    - 1364: Dot fails with failed assertion.
+  - Add new "folder" shape for nodes.
+  - Migration of gvpr tools to libcgraph.
+  - New output format -Teps  (encapsulated postscript)
+  - Various NetBSD and SuSE fixes incorporated
+  - ./configure now provides a summary
 * Tue Apr 29 2008 pth@suse.de
 - Disable the use of ocamlopt as the archive turns up empty (bnc#384855).
 * Sun Apr 27 2008 coolo@suse.de

graphviz-rpmlintrc

@@ -6,4 +6,6 @@ addFilter("graphviz.* rpm-buildroot-usage")
 addFilter("graphviz.* postun-without-ldconfig")
 addFilter("graphviz.* non-devel-buildrequires")
 addFilter("graphviz.* %install-no-mkdir-buildroot")
+addFilter("graphviz-perl.* perl5-naming-policy-not-applied")
+addFilter("graphviz-python.* python-naming-policy-not-applied")
 addFilter("graphviz.* devel-file-in-non-devel-package")

graphviz-stddefs.patch

@@ -1,15 +1,5 @@
---- lib/sfio/sfvprintf.c.orig	2008-04-27 12:42:51.000000000 +0200
+--- lib/sfio/sftable.c
-+++ lib/sfio/sfvprintf.c	2008-04-27 12:43:00.000000000 +0200
++++ lib/sfio/sftable.c
-@@ -14,6 +14,7 @@
- *              AT&T Research, Florham Park NJ             *
- **********************************************************/
- 
-+#include <stddef.h>
- #include	"sfhdr.h"
- 
- /*	The engine for formatting data
---- lib/sfio/sftable.c.orig	2008-04-27 12:40:15.000000000 +0200
-+++ lib/sfio/sftable.c	2008-04-27 12:42:43.000000000 +0200
 @@ -14,6 +14,8 @@
  *              AT&T Research, Florham Park NJ             *
  **********************************************************/
@@ -19,8 +9,18 @@
  #include	"sfhdr.h"
  
  /*	Dealing with $ argument addressing stuffs.
---- lib/sfio/sfvscanf.c.orig	2008-04-27 13:56:17.000000000 +0200
+--- lib/sfio/sfvprintf.c
-+++ lib/sfio/sfvscanf.c	2008-04-27 13:56:35.000000000 +0200
++++ lib/sfio/sfvprintf.c
+@@ -14,6 +14,7 @@
+ *              AT&T Research, Florham Park NJ             *
+ **********************************************************/
+ 
++#include <stddef.h>
+ #include	"sfhdr.h"
+ 
+ /*	The engine for formatting data
+--- lib/sfio/sfvscanf.c
++++ lib/sfio/sfvscanf.c
 @@ -14,6 +14,7 @@
  *              AT&T Research, Florham Park NJ             *
  **********************************************************/

graphviz-strcmp_fix.patch

@@ -1,11 +0,0 @@
---- lib/common/diagen.c
-+++ lib/common/diagen.c
-@@ -243,7 +243,7 @@
- 
- static void dia_grstyle(context_t * cp)
- {
--    if (cp->pencolor != DEFAULT_COLOR) {
-+    if (strcmp(cp->pencolor, DEFAULT_COLOR)) {
- 	dia_fputs("      <dia:attribute name=\"border_color\">\n");
- 	dia_printf("        <dia:color val=\"%s\"/>\n",
- 		   dia_resolve_color(cp->pencolor));

graphviz.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Thu Jul 10 12:11:47 CEST 2008 - pth@suse.de
+
+- Update to 2.20.2. Changes since 2.18:
+
+  2.20.2:
+  - Fix bug in HTML-like labels
+
+  2.20.1:
+  - Fix bug in ccomps related to conversion to cgraph
+
+  2.20.0:
+  - Fixed bugs (see http://www.graphviz.org/bugs/buglist.html for
+    details: 
+    - 1315: Different/error output for *.os and *.pdf
+    - 1317: Graphviz fails to open more than 512 files.
+    - 1324: Graphviz crashes in atexit().
+    - 1336: Plain format label delimiters change randomly.
+    - 1343: Layouts other than 'dot' seem broken in tcldot due to
+            documentation error.
+    - 1364: Dot fails with failed assertion.
+  - Add new "folder" shape for nodes.
+  - Migration of gvpr tools to libcgraph.
+  - New output format -Teps  (encapsulated postscript)
+  - Various NetBSD and SuSE fixes incorporated
+  - ./configure now provides a summary
+
 -------------------------------------------------------------------
 Sun Apr 27 14:41:01 CEST 2008 - coolo@suse.de
 

graphviz.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package graphviz (Version 2.18)
+# spec file for package graphviz (Version 2.20.2)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -17,26 +17,16 @@ BuildRequires:  bison flex glib2-devel xorg-x11-devel
 BuildRequires:  xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXpm-devel
 BuildRequires:  xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXmu-devel xorg-x11-libXt-devel
 PreReq:         /bin/rm
-Version:        2.18
+Version:        2.20.2
-Release:        16
+Release:        1
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
 Source:         http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.bz2
 Source2:        graphviz-rpmlintrc
 Patch0:         graphviz-fix-pkgIndex.patch
-Patch1:         graphviz-aliasing-fixes.patch
-Patch2:         graphviz-fix_swig_template.patch
 Patch3:         graphviz-neato_splines.patch
-Patch4:         graphviz-strcmp_fix.patch
-Patch5:         graphviz-fix_manpages.patch
-Patch7:         graphviz-codecleanup.patch
-Patch8:         graphviz-missing_includes.patch
-Patch9:         graphviz-configure_grok_vars.patch
-Patch10:        graphviz-2.18-duplicate_decls.patch
 Patch11:        graphviz-%{version}-interpreter_names.patch
-#Patch obsolete with the next release after 2.18
-Patch12:        graphviz-dot_verify_plugins.patch
 Patch13:        graphviz-stddefs.patch
 Url:            http://www.graphviz.org/
 License:        IBM Public License
@@ -90,17 +80,8 @@ Authors:
 %prep
 %setup -q
 %patch
-%patch1
-%patch2
 %patch3
-%patch4
-%patch5
-%patch7
-%patch8
-%patch9
-%patch10
 %patch11
-%patch12
 %patch13
 # 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
@@ -216,6 +197,27 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 %{_mandir}/man3/*.3.gz
 
 %changelog
+* Thu Jul 10 2008 pth@suse.de
+- Update to 2.20.2. Changes since 2.18:
+  2.20.2:
+  - Fix bug in HTML-like labels
+  2.20.1:
+  - Fix bug in ccomps related to conversion to cgraph
+  2.20.0:
+  - Fixed bugs (see http://www.graphviz.org/bugs/buglist.html for
+  details:
+    - 1315: Different/error output for *.os and *.pdf
+    - 1317: Graphviz fails to open more than 512 files.
+    - 1324: Graphviz crashes in atexit().
+    - 1336: Plain format label delimiters change randomly.
+    - 1343: Layouts other than 'dot' seem broken in tcldot due to
+  documentation error.
+    - 1364: Dot fails with failed assertion.
+  - Add new "folder" shape for nodes.
+  - Migration of gvpr tools to libcgraph.
+  - New output format -Teps  (encapsulated postscript)
+  - Various NetBSD and SuSE fixes incorporated
+  - ./configure now provides a summary
 * Sun Apr 27 2008 coolo@suse.de
 - fix build
 * Tue Apr 22 2008 pth@suse.de