From fbf42391e30d26e652bf8b1ebd7f454ced788736b343605ccd6a85fdeb664343 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 18 Mar 2010 21:58:40 +0000 Subject: [PATCH] Accepting request 35095 from graphics checked in (request 35095) OBS-URL: https://build.opensuse.org/request/show/35095 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=9 --- graphviz-2.18-do_not_use_ocamlopt.patch | 6 ++-- graphviz-2.20.2.tar.bz2 | 3 ++ graphviz-2.26.3.tar.bz2 | 3 -- graphviz-fix_gstack_overflow.patch | 22 ++++++++++++ graphviz-neato_splines.patch | 2 +- graphviz-plugins-fix_install_dirs.patch | 4 +-- graphviz-plugins.spec | 36 ++++++++++++------- graphviz.changes | 47 ------------------------- graphviz.spec | 9 +++-- python-version.diff | 2 +- 10 files changed, 61 insertions(+), 73 deletions(-) create mode 100644 graphviz-2.20.2.tar.bz2 delete mode 100644 graphviz-2.26.3.tar.bz2 create mode 100644 graphviz-fix_gstack_overflow.patch diff --git a/graphviz-2.18-do_not_use_ocamlopt.patch b/graphviz-2.18-do_not_use_ocamlopt.patch index 55de314..f4a50b1 100644 --- a/graphviz-2.18-do_not_use_ocamlopt.patch +++ b/graphviz-2.18-do_not_use_ocamlopt.patch @@ -1,6 +1,6 @@ --- tclpkg/gv/Makefile.am +++ tclpkg/gv/Makefile.am -@@ -89,9 +89,9 @@ +@@ -79,9 +79,9 @@ pkgocamldir = $(pkglibdir)/ocaml OCAML_data = gv.cmo gv.cma gv.cmi gv.mli META.gv @@ -11,5 +11,5 @@ +#OCAML_data += gv.a gv.cmx gv.cmxa +#endif nodist_libgv_ocaml_la_SOURCES = gv_ocaml.cpp $(OCAML_data) - libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_dummy_init.c - libgv_ocaml_la_LIBADD = $(BASELIBS) $(OCAML_LIBS) + libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_dummy_init.cpp + libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@ diff --git a/graphviz-2.20.2.tar.bz2 b/graphviz-2.20.2.tar.bz2 new file mode 100644 index 0000000..9c2f0d4 --- /dev/null +++ b/graphviz-2.20.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac17ec5b417feb781e611ab83fe644d93147b41921e3a92062f931f79484e64c +size 11233143 diff --git a/graphviz-2.26.3.tar.bz2 b/graphviz-2.26.3.tar.bz2 deleted file mode 100644 index 782b7cd..0000000 --- a/graphviz-2.26.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae3d24c43ad1af261819ee4b9eeeedc67dd76fe9e7ff3a8994385e4eec1ca13e -size 14857738 diff --git a/graphviz-fix_gstack_overflow.patch b/graphviz-fix_gstack_overflow.patch new file mode 100644 index 0000000..bed06e8 --- /dev/null +++ b/graphviz-fix_gstack_overflow.patch @@ -0,0 +1,22 @@ +--- lib/graph/parser.y 2007-09-07 08:05:44.000000000 -0400 ++++ lib/graph/parser.y 2008-10-07 14:40:07.000000000 -0400 +@@ -31,7 +31,8 @@ + static Agnode_t *N; + static Agedge_t *E; + static objstack_t *SP; +-static Agraph_t *Gstack[32]; ++#define GSTACK_SIZE 64 ++static Agraph_t *Gstack[GSTACK_SIZE]; + static int GSP; + + static void subgraph_warn (void) +@@ -44,6 +45,9 @@ + + static void push_subg(Agraph_t *g) + { ++ if (GSP >= GSTACK_SIZE) { ++ agerr (AGERR, "Gstack overflow in graph parser\n"); exit(1); ++ } + G = Gstack[GSP++] = g; + } + diff --git a/graphviz-neato_splines.patch b/graphviz-neato_splines.patch index f1f896c..ea2ae2d 100644 --- a/graphviz-neato_splines.patch +++ b/graphviz-neato_splines.patch @@ -1,6 +1,6 @@ --- lib/neatogen/neatosplines.c +++ lib/neatogen/neatosplines.c -@@ -63,6 +63,8 @@ +@@ -61,6 +61,8 @@ n = n + poly[i]->pn; } bar = N_GNEW(n, Pedge_t); diff --git a/graphviz-plugins-fix_install_dirs.patch b/graphviz-plugins-fix_install_dirs.patch index 801532a..691d73f 100644 --- a/graphviz-plugins-fix_install_dirs.patch +++ b/graphviz-plugins-fix_install_dirs.patch @@ -1,6 +1,6 @@ --- configure.ac +++ configure.ac -@@ -1013,8 +1013,8 @@ +@@ -958,8 +958,8 @@ else PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM" fi @@ -11,7 +11,7 @@ PHP_LIBS= save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $PHP_INCLUDES" -@@ -1489,7 +1489,7 @@ +@@ -1391,7 +1391,7 @@ AC_MSG_WARN([Unable to find tclConfig.sh. The Tcl packages will not be built]) use_tcl="No (missing tclConfig.sh)" fi diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec index d827fea..be0244e 100644 --- a/graphviz-plugins.spec +++ b/graphviz-plugins.spec @@ -1,5 +1,5 @@ # -# spec file for package graphviz-plugins (Version 2.26.3) +# spec file for package graphviz-plugins (Version 2.20.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,7 +29,7 @@ BuildRequires: graphviz gtkglext-devel libglade2-devel libgnomeui-devel %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif -Version: 2.26.3 +Version: 2.20.2 Release: 8 AutoReqProv: on Summary: Graph Visualization Tools @@ -38,8 +38,10 @@ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version} #Source1: %{name}-rpmlintrc Patch0: graphviz-fix-pkgIndex.patch Patch3: graphviz-neato_splines.patch -Patch11: graphviz-2.20.2-interpreter_names.patch +Patch11: graphviz-%{version}-interpreter_names.patch Patch13: graphviz-stddefs.patch +#Any version after 2.20.2 will contain the following patch +Patch14: graphviz-fix_gstack_overflow.patch #Patches above 100 are graphviz-plugins specific. Patch100: graphviz-plugins-fix_install_dirs.patch Patch101: graphviz-plugins-tcl_install_dir.patch @@ -376,6 +378,7 @@ Authors: %patch3 %patch11 %patch13 +%patch14 %patch100 %patch101 %patch103 @@ -481,7 +484,7 @@ done %files -n graphviz-guile %defattr(-,root,root,-) %{_libdir}/graphviz/guile -%doc %{_mandir}/man3/gv.3guile.gz +%doc %{_mandir}/mann/gv_guile.n.gz %files -n graphviz-java %defattr(-,root,root,-) @@ -490,7 +493,7 @@ done %files -n graphviz-sharp %defattr(-,root,root) %{_libdir}/graphviz/sharp -%doc %{_mandir}/man3/gv.3sharp.gz +%doc %{_mandir}/mann/gv_sharp.n.gz %files -n graphviz-lua %defattr(-,root,root,-) @@ -499,12 +502,12 @@ done %dir %lua_libdir %{_libdir}/graphviz/lua %{lua_libdir}/gv.so -%doc %{_mandir}/man3/gv.3lua.gz +%doc %{_mandir}/mann/gv_lua.n.gz %files -n graphviz-ocaml %defattr(-,root,root,-) %{_libdir}/graphviz/ocaml -%doc %{_mandir}/man3/gv.3ocaml.gz +%doc %{_mandir}/mann/gv_ocaml.n.gz %files -n graphviz-perl %defattr(-,root,root,-) @@ -512,13 +515,13 @@ done %{perl_vendorarch}/gv.pm %{perl_vendorarch}/gv.so %{_datadir}/%{mname}/demo/modgraph.pl -%doc %{_mandir}/man3/gv.3perl.gz +%doc %{_mandir}/mann/gv_perl.n.gz %files -n graphviz-php %defattr(-,root,root,-) %{_libdir}/php5/extensions/gv.so %{_datadir}/php5/gv.php -%doc %{_mandir}/man3/gv.3php.gz +%doc %{_mandir}/mann/gv_php.n.gz %dir %{_libdir}/%{mname}/php %{_libdir}/%{mname}/php/gv.php %{_libdir}/%{mname}/php/gv.so @@ -530,14 +533,14 @@ done %{_libdir}/graphviz/python %{py_sitedir}/_gv.so %{py_sitedir}/gv.py -%doc %{_mandir}/man3/gv.3python.gz +%doc %{_mandir}/mann/gv_python.n.gz %{_datadir}/%{mname}/demo/modgraph.py %files -n graphviz-ruby %defattr(-,root,root,-) %{_libdir}/graphviz/ruby %{rb_sitedir}/*-%{_os}/gv.so -%doc %{_mandir}/man3/gv.3ruby.gz +%doc %{_mandir}/mann/gv_ruby.n.gz %{_datadir}/%{mname}/demo/modgraph.rb %files -n graphviz-tcl @@ -550,8 +553,15 @@ done %{_libdir}/libtkspline* %{_datadir}/tcl/%{mname}/pkgIndex.tcl %{_datadir}/graphviz/demo -%doc %{_mandir}/man3/*.3tcl* -%doc %{_mandir}/man3/*.3tk* +%doc %{_mandir}/mann/*.n* +%exclude %{_mandir}/mann/gv_lua.n.gz +%exclude %{_mandir}/mann/gv_perl.n.gz +%exclude %{_mandir}/mann/gv_ruby.n.gz +%exclude %{_mandir}/mann/gv_sharp.n.gz +%exclude %{_mandir}/mann/gv_guile.n.gz +%exclude %{_mandir}/mann/gv_python.n.gz +%exclude %{_mandir}/mann/gv_php.n.gz +%exclude %{_mandir}/mann/gv_ocaml.n.gz %exclude %{_datadir}/%{mname}/demo/modgraph.rb %exclude %{_datadir}/%{mname}/demo/modgraph.php %exclude %{_datadir}/%{mname}/demo/modgraph.py diff --git a/graphviz.changes b/graphviz.changes index 6cc356a..d503fa3 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,50 +1,3 @@ -------------------------------------------------------------------- -Tue Mar 16 18:52:54 CET 2010 - ro@suse.de - -- update to 2.26.3 - - libcgraph.so version bumped from 4 to 5 due to API changes - - Allow ranksep to specify multiple radial differences in twopi - - Allow the user to specify all pairwise distances in neato with - - added: "smyrna" - a new opengl-based viewer for large graphs - - added: rudimentary "gml2gv", "gv2gml" converters - - extended support for various image formats in node images - - removed vestiges of codegens, now all putput formats supported - through plugins. Dropped some output formats for which - plugins have not been developed: -Tdia, -Tmif - - gvpr converted to a library; additional array handling and - text processing functions added; language extended to allow - multiple BEG_G/N/E blocks. - - allow background images specified via xdot - - add new layout engine for large graphs: sfdp - - add new layout engine for nested graphs: osage - - fix for buffer overflow (present in 2.22.0 and 2.22.1) - - libgvc api changed, version bumped. Affects third party - applications using libgvc. - - plugin api changed, version bumped. Affects third party - plugins for graphviz. - - 90% conversion to cgraph has been done, but not enabled yet, - (and yes, its true what they say about the last 10% ) - - drop libagraph from distribution (use libcgraph) - - layout code completely converted to floating point. - - new "dot -P" option for generating a graph of available - plugins. - - registered MIME type: text/vnd.graphviz for .gv files - - rename files from .dot to .gv to avoid conflict with - Word templates. .dot still supported, but deprecated. - - new command: mm2gv (matrix-market graph file conversion) - - rename commands: dot2gxl -> gv2gxl - gxl2dot -> gxl2gv - - new rsvg plugin for support of node shapes in SVG format - - new gs plugin for support of node shapes in PS format - - new lasi plugin for support of UTF-8 characters in PS output - (the above thee plugins are Linux only, at the moment) - - new quartz plugin (MacOSx only) - - new gdiplus plugin (Windows only) - - new -Tvml support in core plugin (thanks Steve Roush) - - new -Ttk support in core plugin (also used by Tcldot and - gv_tcl language bindings.) - - disabled old style codegens completely - ------------------------------------------------------------------- Tue Dec 15 21:30:37 CET 2009 - jengelh@medozas.de diff --git a/graphviz.spec b/graphviz.spec index 93b838f..0f5c83e 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -1,5 +1,5 @@ # -# spec file for package graphviz (Version 2.26.3) +# spec file for package graphviz (Version 2.20.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,7 +24,7 @@ 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.26.3 +Version: 2.20.2 Release: 45 AutoReqProv: on Summary: Graph Visualization Tools @@ -33,8 +33,10 @@ Source: http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}. Source2: graphviz-rpmlintrc Patch0: graphviz-fix-pkgIndex.patch Patch3: graphviz-neato_splines.patch -Patch11: graphviz-2.20.2-interpreter_names.patch +Patch11: graphviz-%{version}-interpreter_names.patch Patch13: graphviz-stddefs.patch +#Any version after 2.20.2 will contain the following patch +Patch14: graphviz-fix_gstack_overflow.patch Url: http://www.graphviz.org/ License: IBM Public License .. Prefix: /usr @@ -90,6 +92,7 @@ Authors: %patch3 %patch11 %patch13 +%patch14 # 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 # remove broken macros diff --git a/python-version.diff b/python-version.diff index 2104ea8..6efdb28 100644 --- a/python-version.diff +++ b/python-version.diff @@ -1,6 +1,6 @@ --- configure.ac +++ configure.ac -@@ -1056,7 +1056,7 @@ +@@ -1001,7 +1001,7 @@ else if test "x$PYTHON" = "x"; then use_python="No (python not available)" else