From 4dfe22ce75c0abd792b3488e99e2ac22f389886122b8d7b9a932cbd5b9843d7a Mon Sep 17 00:00:00 2001
From: Klaas Freitag <opensuse@freisturz.de>
Date: Sat, 14 Nov 2009 08:55:19 +0000
Subject: [PATCH 1/8] Accepting request 24320 from
 home:dirkmueller:branches:graphics

Copy from home:dirkmueller:branches:graphics/graphviz via accept of submit request 24320 revision 2.
Request was accepted with message:
reviewed ok.

OBS-URL: https://build.opensuse.org/request/show/24320
OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=4
---
 graphviz-plugins.spec | 6 +++---
 graphviz.changes      | 5 -----
 graphviz.spec         | 6 +++---
 ready                 | 0
 4 files changed, 6 insertions(+), 11 deletions(-)
 create mode 100644 ready

diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec
index be0244e..6a09523 100644
--- a/graphviz-plugins.spec
+++ b/graphviz-plugins.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package graphviz-plugins (Version 2.20.2)
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@ BuildRequires:  graphviz gtkglext-devel libglade2-devel libgnomeui-devel
 BuildRequires:  fdupes
 %endif
 Version:        2.20.2
-Release:        8
+Release:        7
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -218,7 +218,7 @@ License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        Perl extension for Graphviz
 Requires:       graphviz = %{version} 
-Requires:       perl = %{perl_version}
+Requires:      perl = %{perl_version}
 Provides:       graphviz_plugin = %{version}-%{release}
 
 %description -n graphviz-perl
diff --git a/graphviz.changes b/graphviz.changes
index d503fa3..a187cd9 100644
--- a/graphviz.changes
+++ b/graphviz.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Tue Dec 15 21:30:37 CET 2009 - jengelh@medozas.de
-
-- enable parallel building
-
 -------------------------------------------------------------------
 Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
 
diff --git a/graphviz.spec b/graphviz.spec
index 0f5c83e..13c4338 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package graphviz (Version 2.20.2)
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@ 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.20.2
-Release:        45
+Release:        44
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -127,7 +127,7 @@ export CPPFLAGS="%optflags"
       --with-ipsepcola \
       --without-ming \
       --disable-io
-make %{?jobs:-j%jobs} DESTDIR=%buildroot
+make DESTDIR=%buildroot
 
 %install
 make install \
diff --git a/ready b/ready
new file mode 100644
index 0000000..473a0f4

From f875266c755aef3c1acd7fd132f561f6c3d19d805481df00806318026040345c Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Thu, 14 Jan 2010 06:47:46 +0000
Subject: [PATCH 2/8] Accepting request 26717 from
 home:jengelh:branches:graphics

Copy from home:jengelh:branches:graphics/graphviz via accept of submit request 26717 revision 2.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/26717
OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=5
---
 graphviz.changes | 5 +++++
 graphviz.spec    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/graphviz.changes b/graphviz.changes
index a187cd9..d503fa3 100644
--- a/graphviz.changes
+++ b/graphviz.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 15 21:30:37 CET 2009 - jengelh@medozas.de
+
+- enable parallel building
+
 -------------------------------------------------------------------
 Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
 
diff --git a/graphviz.spec b/graphviz.spec
index 13c4338..f6f9bd8 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -127,7 +127,7 @@ export CPPFLAGS="%optflags"
       --with-ipsepcola \
       --without-ming \
       --disable-io
-make DESTDIR=%buildroot
+make %{?jobs:-j%jobs} DESTDIR=%buildroot
 
 %install
 make install \

From 44805bc081c0d211c6e830f49483dff73cfe7193dc7118ac2f23dd5bb8bfb513 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 14 Jan 2010 14:54:12 +0000
Subject: [PATCH 3/8] checked in

OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=6
---
 graphviz-plugins.changes | 6 ------
 graphviz-plugins.spec    | 3 +--
 graphviz.changes         | 5 -----
 graphviz.spec            | 2 +-
 4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes
index ee49993..3cacbab 100644
--- a/graphviz-plugins.changes
+++ b/graphviz-plugins.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Fri Nov 13 23:37:02 CET 2009 - dmueller@suse.de
-
-- require the exact perl version it was build against, otherwise
-  libperl.so can not be found
-
 -------------------------------------------------------------------
 Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
 
diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec
index 6a09523..10edbc2 100644
--- a/graphviz-plugins.spec
+++ b/graphviz-plugins.spec
@@ -217,8 +217,7 @@ Authors:
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        Perl extension for Graphviz
-Requires:       graphviz = %{version} 
-Requires:      perl = %{perl_version}
+Requires:       graphviz = %{version} perl
 Provides:       graphviz_plugin = %{version}-%{release}
 
 %description -n graphviz-perl
diff --git a/graphviz.changes b/graphviz.changes
index d503fa3..a187cd9 100644
--- a/graphviz.changes
+++ b/graphviz.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Tue Dec 15 21:30:37 CET 2009 - jengelh@medozas.de
-
-- enable parallel building
-
 -------------------------------------------------------------------
 Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
 
diff --git a/graphviz.spec b/graphviz.spec
index f6f9bd8..13c4338 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -127,7 +127,7 @@ export CPPFLAGS="%optflags"
       --with-ipsepcola \
       --without-ming \
       --disable-io
-make %{?jobs:-j%jobs} DESTDIR=%buildroot
+make DESTDIR=%buildroot
 
 %install
 make install \

From 1d2d96b36d6b0f98a0d50003fc293d11083c0bfc9d458be07f4984ab13d2155e Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Fri, 19 Feb 2010 15:34:22 +0000
Subject: [PATCH 4/8] converted link to branch

OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=7
---
 graphviz-plugins.changes | 6 ++++++
 graphviz-plugins.spec    | 7 ++++---
 graphviz.changes         | 5 +++++
 graphviz.spec            | 6 +++---
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes
index 3cacbab..ee49993 100644
--- a/graphviz-plugins.changes
+++ b/graphviz-plugins.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 13 23:37:02 CET 2009 - dmueller@suse.de
+
+- require the exact perl version it was build against, otherwise
+  libperl.so can not be found
+
 -------------------------------------------------------------------
 Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
 
diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec
index 10edbc2..be0244e 100644
--- a/graphviz-plugins.spec
+++ b/graphviz-plugins.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package graphviz-plugins (Version 2.20.2)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@ BuildRequires:  graphviz gtkglext-devel libglade2-devel libgnomeui-devel
 BuildRequires:  fdupes
 %endif
 Version:        2.20.2
-Release:        7
+Release:        8
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -217,7 +217,8 @@ Authors:
 License:        IBM Public License ..
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        Perl extension for Graphviz
-Requires:       graphviz = %{version} perl
+Requires:       graphviz = %{version} 
+Requires:       perl = %{perl_version}
 Provides:       graphviz_plugin = %{version}-%{release}
 
 %description -n graphviz-perl
diff --git a/graphviz.changes b/graphviz.changes
index a187cd9..d503fa3 100644
--- a/graphviz.changes
+++ b/graphviz.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Dec 15 21:30:37 CET 2009 - jengelh@medozas.de
+
+- enable parallel building
+
 -------------------------------------------------------------------
 Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
 
diff --git a/graphviz.spec b/graphviz.spec
index 13c4338..0f5c83e 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package graphviz (Version 2.20.2)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@ 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.20.2
-Release:        44
+Release:        45
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -127,7 +127,7 @@ export CPPFLAGS="%optflags"
       --with-ipsepcola \
       --without-ming \
       --disable-io
-make DESTDIR=%buildroot
+make %{?jobs:-j%jobs} DESTDIR=%buildroot
 
 %install
 make install \

From e1ff0bc3c550dc64a4c93ad548bd4c7b90f67fb975b7a890b6c266cdbc0539b1 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 17 Mar 2010 16:17:59 +0000
Subject: [PATCH 5/8] Accepting request 34972 from
 home:oertel:branches:openSUSE:Factory

Copy from home:oertel:branches:openSUSE:Factory/graphviz via accept of submit request 34972 revision 5.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/34972
OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=8
---
 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, 73 insertions(+), 61 deletions(-)
 delete mode 100644 graphviz-2.20.2.tar.bz2
 create mode 100644 graphviz-2.26.3.tar.bz2
 delete 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 f4a50b1..55de314 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
-@@ -79,9 +79,9 @@
+@@ -89,9 +89,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.cpp
- libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@
+ libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
+ libgv_ocaml_la_LIBADD = $(BASELIBS) $(OCAML_LIBS)
diff --git a/graphviz-2.20.2.tar.bz2 b/graphviz-2.20.2.tar.bz2
deleted file mode 100644
index 9c2f0d4..0000000
--- a/graphviz-2.20.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-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
new file mode 100644
index 0000000..782b7cd
--- /dev/null
+++ b/graphviz-2.26.3.tar.bz2
@@ -0,0 +1,3 @@
+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
deleted file mode 100644
index bed06e8..0000000
--- a/graphviz-fix_gstack_overflow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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 ea2ae2d..f1f896c 100644
--- a/graphviz-neato_splines.patch
+++ b/graphviz-neato_splines.patch
@@ -1,6 +1,6 @@
 --- lib/neatogen/neatosplines.c
 +++ lib/neatogen/neatosplines.c
-@@ -61,6 +61,8 @@
+@@ -63,6 +63,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 691d73f..801532a 100644
--- a/graphviz-plugins-fix_install_dirs.patch
+++ b/graphviz-plugins-fix_install_dirs.patch
@@ -1,6 +1,6 @@
 --- configure.ac
 +++ configure.ac
-@@ -958,8 +958,8 @@
+@@ -1013,8 +1013,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"
-@@ -1391,7 +1391,7 @@
+@@ -1489,7 +1489,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 be0244e..d827fea 100644
--- a/graphviz-plugins.spec
+++ b/graphviz-plugins.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package graphviz-plugins (Version 2.20.2)
+# spec file for package graphviz-plugins (Version 2.26.3)
 #
 # 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.20.2
+Version:        2.26.3
 Release:        8
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
@@ -38,10 +38,8 @@ 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-%{version}-interpreter_names.patch
+Patch11:        graphviz-2.20.2-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
@@ -378,7 +376,6 @@ Authors:
 %patch3
 %patch11
 %patch13
-%patch14
 %patch100
 %patch101
 %patch103
@@ -484,7 +481,7 @@ done
 %files -n graphviz-guile
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/guile
-%doc %{_mandir}/mann/gv_guile.n.gz
+%doc %{_mandir}/man3/gv.3guile.gz
 
 %files -n graphviz-java
 %defattr(-,root,root,-)
@@ -493,7 +490,7 @@ done
 %files -n graphviz-sharp
 %defattr(-,root,root)
 %{_libdir}/graphviz/sharp
-%doc %{_mandir}/mann/gv_sharp.n.gz
+%doc %{_mandir}/man3/gv.3sharp.gz
 
 %files -n graphviz-lua
 %defattr(-,root,root,-)
@@ -502,12 +499,12 @@ done
 %dir %lua_libdir
 %{_libdir}/graphviz/lua
 %{lua_libdir}/gv.so
-%doc %{_mandir}/mann/gv_lua.n.gz
+%doc %{_mandir}/man3/gv.3lua.gz
 
 %files -n graphviz-ocaml
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/ocaml
-%doc %{_mandir}/mann/gv_ocaml.n.gz
+%doc %{_mandir}/man3/gv.3ocaml.gz
 
 %files -n graphviz-perl
 %defattr(-,root,root,-)
@@ -515,13 +512,13 @@ done
 %{perl_vendorarch}/gv.pm
 %{perl_vendorarch}/gv.so
 %{_datadir}/%{mname}/demo/modgraph.pl
-%doc %{_mandir}/mann/gv_perl.n.gz
+%doc %{_mandir}/man3/gv.3perl.gz
 
 %files -n graphviz-php
 %defattr(-,root,root,-)
 %{_libdir}/php5/extensions/gv.so
 %{_datadir}/php5/gv.php
-%doc %{_mandir}/mann/gv_php.n.gz
+%doc %{_mandir}/man3/gv.3php.gz
 %dir %{_libdir}/%{mname}/php
 %{_libdir}/%{mname}/php/gv.php
 %{_libdir}/%{mname}/php/gv.so
@@ -533,14 +530,14 @@ done
 %{_libdir}/graphviz/python
 %{py_sitedir}/_gv.so
 %{py_sitedir}/gv.py
-%doc %{_mandir}/mann/gv_python.n.gz
+%doc %{_mandir}/man3/gv.3python.gz
 %{_datadir}/%{mname}/demo/modgraph.py
 
 %files -n graphviz-ruby
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/ruby
 %{rb_sitedir}/*-%{_os}/gv.so
-%doc %{_mandir}/mann/gv_ruby.n.gz
+%doc %{_mandir}/man3/gv.3ruby.gz
 %{_datadir}/%{mname}/demo/modgraph.rb
 
 %files -n graphviz-tcl
@@ -553,15 +550,8 @@ done
 %{_libdir}/libtkspline*
 %{_datadir}/tcl/%{mname}/pkgIndex.tcl
 %{_datadir}/graphviz/demo
-%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
+%doc %{_mandir}/man3/*.3tcl*
+%doc %{_mandir}/man3/*.3tk*
 %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 d503fa3..6cc356a 100644
--- a/graphviz.changes
+++ b/graphviz.changes
@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+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 0f5c83e..93b838f 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package graphviz (Version 2.20.2)
+# spec file for package graphviz (Version 2.26.3)
 #
 # 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.20.2
+Version:        2.26.3
 Release:        45
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
@@ -33,10 +33,8 @@ 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-%{version}-interpreter_names.patch
+Patch11:        graphviz-2.20.2-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
@@ -92,7 +90,6 @@ 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 6efdb28..2104ea8 100644
--- a/python-version.diff
+++ b/python-version.diff
@@ -1,6 +1,6 @@
 --- configure.ac
 +++ configure.ac
-@@ -1001,7 +1001,7 @@ else
+@@ -1056,7 +1056,7 @@
        if test "x$PYTHON" = "x"; then
          use_python="No (python not available)"
        else

From 61566bb3771fdc51cd8bc6b4c6c8fbd2dace5e7901594cf926676a6b7cbba553 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Thu, 18 Mar 2010 14:51:09 +0000
Subject: [PATCH 6/8] Updating link to change in openSUSE:Factory/graphviz
 revision 32.0

OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=c94753eb1712f89d48f5bc967d9fb474
---
 ready | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 ready

diff --git a/ready b/ready
deleted file mode 100644
index 473a0f4..0000000

From fbf42391e30d26e652bf8b1ebd7f454ced788736b343605ccd6a85fdeb664343 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 18 Mar 2010 21:58:40 +0000
Subject: [PATCH 7/8] 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

From 078d3f3f281222e44eac21ca793b6d21651fde518e139d8c18c93d9f514550f5 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Thu, 18 Mar 2010 21:58:41 +0000
Subject: [PATCH 8/8] Updating link to change in openSUSE:Factory/graphviz
 revision 33.0

OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=8b479c40994885528b02f4f9809fc37b
---
 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                   | 38 ++++++++------------
 graphviz.changes                        | 47 +++++++++++++++++++++++++
 graphviz.spec                           | 11 +++---
 python-version.diff                     |  2 +-
 10 files changed, 75 insertions(+), 63 deletions(-)
 delete mode 100644 graphviz-2.20.2.tar.bz2
 create mode 100644 graphviz-2.26.3.tar.bz2
 delete 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 f4a50b1..55de314 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
-@@ -79,9 +79,9 @@
+@@ -89,9 +89,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.cpp
- libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@
+ libgv_ocaml_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
+ libgv_ocaml_la_LIBADD = $(BASELIBS) $(OCAML_LIBS)
diff --git a/graphviz-2.20.2.tar.bz2 b/graphviz-2.20.2.tar.bz2
deleted file mode 100644
index 9c2f0d4..0000000
--- a/graphviz-2.20.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-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
new file mode 100644
index 0000000..782b7cd
--- /dev/null
+++ b/graphviz-2.26.3.tar.bz2
@@ -0,0 +1,3 @@
+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
deleted file mode 100644
index bed06e8..0000000
--- a/graphviz-fix_gstack_overflow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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 ea2ae2d..f1f896c 100644
--- a/graphviz-neato_splines.patch
+++ b/graphviz-neato_splines.patch
@@ -1,6 +1,6 @@
 --- lib/neatogen/neatosplines.c
 +++ lib/neatogen/neatosplines.c
-@@ -61,6 +61,8 @@
+@@ -63,6 +63,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 691d73f..801532a 100644
--- a/graphviz-plugins-fix_install_dirs.patch
+++ b/graphviz-plugins-fix_install_dirs.patch
@@ -1,6 +1,6 @@
 --- configure.ac
 +++ configure.ac
-@@ -958,8 +958,8 @@
+@@ -1013,8 +1013,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"
-@@ -1391,7 +1391,7 @@
+@@ -1489,7 +1489,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 be0244e..15dfe50 100644
--- a/graphviz-plugins.spec
+++ b/graphviz-plugins.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package graphviz-plugins (Version 2.20.2)
+# spec file for package graphviz-plugins (Version 2.26.3)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -29,8 +29,8 @@ BuildRequires:  graphviz gtkglext-devel libglade2-devel libgnomeui-devel
 %if 0%{?suse_version} > 1020
 BuildRequires:  fdupes
 %endif
-Version:        2.20.2
-Release:        8
+Version:        2.26.3
+Release:        1
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -38,10 +38,8 @@ 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-%{version}-interpreter_names.patch
+Patch11:        graphviz-2.20.2-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
@@ -378,7 +376,6 @@ Authors:
 %patch3
 %patch11
 %patch13
-%patch14
 %patch100
 %patch101
 %patch103
@@ -484,7 +481,7 @@ done
 %files -n graphviz-guile
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/guile
-%doc %{_mandir}/mann/gv_guile.n.gz
+%doc %{_mandir}/man3/gv.3guile.gz
 
 %files -n graphviz-java
 %defattr(-,root,root,-)
@@ -493,7 +490,7 @@ done
 %files -n graphviz-sharp
 %defattr(-,root,root)
 %{_libdir}/graphviz/sharp
-%doc %{_mandir}/mann/gv_sharp.n.gz
+%doc %{_mandir}/man3/gv.3sharp.gz
 
 %files -n graphviz-lua
 %defattr(-,root,root,-)
@@ -502,12 +499,12 @@ done
 %dir %lua_libdir
 %{_libdir}/graphviz/lua
 %{lua_libdir}/gv.so
-%doc %{_mandir}/mann/gv_lua.n.gz
+%doc %{_mandir}/man3/gv.3lua.gz
 
 %files -n graphviz-ocaml
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/ocaml
-%doc %{_mandir}/mann/gv_ocaml.n.gz
+%doc %{_mandir}/man3/gv.3ocaml.gz
 
 %files -n graphviz-perl
 %defattr(-,root,root,-)
@@ -515,13 +512,13 @@ done
 %{perl_vendorarch}/gv.pm
 %{perl_vendorarch}/gv.so
 %{_datadir}/%{mname}/demo/modgraph.pl
-%doc %{_mandir}/mann/gv_perl.n.gz
+%doc %{_mandir}/man3/gv.3perl.gz
 
 %files -n graphviz-php
 %defattr(-,root,root,-)
 %{_libdir}/php5/extensions/gv.so
 %{_datadir}/php5/gv.php
-%doc %{_mandir}/mann/gv_php.n.gz
+%doc %{_mandir}/man3/gv.3php.gz
 %dir %{_libdir}/%{mname}/php
 %{_libdir}/%{mname}/php/gv.php
 %{_libdir}/%{mname}/php/gv.so
@@ -533,14 +530,14 @@ done
 %{_libdir}/graphviz/python
 %{py_sitedir}/_gv.so
 %{py_sitedir}/gv.py
-%doc %{_mandir}/mann/gv_python.n.gz
+%doc %{_mandir}/man3/gv.3python.gz
 %{_datadir}/%{mname}/demo/modgraph.py
 
 %files -n graphviz-ruby
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/ruby
 %{rb_sitedir}/*-%{_os}/gv.so
-%doc %{_mandir}/mann/gv_ruby.n.gz
+%doc %{_mandir}/man3/gv.3ruby.gz
 %{_datadir}/%{mname}/demo/modgraph.rb
 
 %files -n graphviz-tcl
@@ -553,15 +550,8 @@ done
 %{_libdir}/libtkspline*
 %{_datadir}/tcl/%{mname}/pkgIndex.tcl
 %{_datadir}/graphviz/demo
-%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
+%doc %{_mandir}/man3/*.3tcl*
+%doc %{_mandir}/man3/*.3tk*
 %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 d503fa3..6cc356a 100644
--- a/graphviz.changes
+++ b/graphviz.changes
@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+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 0f5c83e..6e36909 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package graphviz (Version 2.20.2)
+# spec file for package graphviz (Version 2.26.3)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -24,8 +24,8 @@ 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.20.2
-Release:        45
+Version:        2.26.3
+Release:        1
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -33,10 +33,8 @@ 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-%{version}-interpreter_names.patch
+Patch11:        graphviz-2.20.2-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
@@ -92,7 +90,6 @@ 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 6efdb28..2104ea8 100644
--- a/python-version.diff
+++ b/python-version.diff
@@ -1,6 +1,6 @@
 --- configure.ac
 +++ configure.ac
-@@ -1001,7 +1001,7 @@ else
+@@ -1056,7 +1056,7 @@
        if test "x$PYTHON" = "x"; then
          use_python="No (python not available)"
        else