diff --git a/graphviz-2.11-php_check.patch b/graphviz-2.11-php_check.patch
deleted file mode 100644
index b8c75fe..0000000
--- a/graphviz-2.11-php_check.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -628,7 +628,7 @@
- AC_ARG_ENABLE(php,
-   [AC_HELP_STRING([--disable-php], [don't support php language bindings])])
- if test "x$enable_php" != "xno"; then
--if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0; then
-+if test `$SWIG -help 2>&1 | $GREP -c '\-php[[5 ]]*- Generate'` = 0; then
- 	PHP=
- 	AC_MSG_WARN([swig does not support php. The PHP packages will not be built])
- else
diff --git a/graphviz-2.12.tar.bz2 b/graphviz-2.12.tar.bz2
deleted file mode 100644
index 8ad7a76..0000000
--- a/graphviz-2.12.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81010d45d29ec177ae1b2dc75b7489f3968748664d1e84b077b7922fb5b98e91
-size 3847126
diff --git a/graphviz-2.18-duplicate_decls.patch b/graphviz-2.18-duplicate_decls.patch
new file mode 100644
index 0000000..cc93f26
--- /dev/null
+++ b/graphviz-2.18-duplicate_decls.patch
@@ -0,0 +1,22 @@
+--- 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 %{
diff --git a/graphviz-2.18.tar.bz2 b/graphviz-2.18.tar.bz2
new file mode 100644
index 0000000..48209d7
--- /dev/null
+++ b/graphviz-2.18.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff6547494df59d25c27486686897114bcf26a5c7f519fb7c813ee932c289a2fa
+size 11214186
diff --git a/graphviz-aliasing-fixes.patch b/graphviz-aliasing-fixes.patch
index 3dce721..633999e 100644
--- a/graphviz-aliasing-fixes.patch
+++ b/graphviz-aliasing-fixes.patch
@@ -63,46 +63,3 @@
  }
  
  void agflatten(Agraph_t * g, int flag)
---- lib/gd/fontwheeltest.c
-+++ lib/gd/fontwheeltest.c
-@@ -21,8 +21,10 @@
- dowheel (gdImagePtr im, int color, char *fontfile, int fontsize,
- 	double angle, int x, int y, int offset, char *string)
- {
--  int brect[8];
--  gdPoint points[4];
-+  union {
-+    int coords[8];
-+    gdPoint points[4];
-+  } brect;
-   int i;
-   FILE *err;
-   double curangrads, curang, x0, y0;
-@@ -42,24 +44,16 @@
- 
-       /* The case of newlines is taken care of in the gdImageStringTTF call */
- #if defined(OLDER_GD)
--      cp = gdImageStringTTF (im, brect, color, fontfile, fontsize,
-+      cp = gdImageStringTTF (im, brect.coords, color, fontfile, fontsize,
- 			  curangrads, x0, y0, string);
- #else
--      cp = gdImageStringFT (im, brect, color, fontfile, fontsize,
-+      cp = gdImageStringFT (im, brect.coords, color, fontfile, fontsize,
- 			 curangrads, x0, y0, string);
- #endif
-       if (cp)
- 	doerr (err, cp);
- 
--      /* FIXME - this is silly, but if we try to cast int[] to gdPointPtr
--       * we get a "warning: dereferencing type-punned pointer will break strict -aliasing rules" from gcc
--       * The proper fix probably requires an API change to use gdPoint[] in gdImageString*
--       */
--      for (i = 0; i < 4; i++) {
--	points[i].x = brect[2*i];
--	points[i].y = brect[2*i + 1];
--      }
--      gdImagePolygon (im, points, 4, color);
-+      gdImagePolygon (im, brect.points, 4, color);
-     }
- 
-   fclose (err);
diff --git a/graphviz-conf.patch b/graphviz-conf.patch
deleted file mode 100644
index fe48216..0000000
--- a/graphviz-conf.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -9,6 +9,7 @@ dnl ====================================
- AC_INIT(graphviz, 2.12)
- 
- # libtool shared library version
-+m4_pattern_allow([^LT_(CURRENT|REVISION|AGE)$])
- 
- # Increment if the interface has additions, changes, removals.
- LT_CURRENT=3
diff --git a/graphviz-configure_grok_vars.patch b/graphviz-configure_grok_vars.patch
new file mode 100644
index 0000000..d4d98d8
--- /dev/null
+++ b/graphviz-configure_grok_vars.patch
@@ -0,0 +1,31 @@
+--- 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 ===========================================================================
+ 
diff --git a/graphviz-fix-pkgIndex.patch b/graphviz-fix-pkgIndex.patch
index 5392631..486b027 100644
--- a/graphviz-fix-pkgIndex.patch
+++ b/graphviz-fix-pkgIndex.patch
@@ -13,5 +13,5 @@
      echo "	package require Tk 8.3" >>pkgIndex.tcl
      ;;
  esac
--echo "	load [file join \$dir tcl $lib] $2\"" >>pkgIndex.tcl
+-echo "	load [file join \$dir $lib] $2\"" >>pkgIndex.tcl
 +echo "	load $lib $2\"" >>pkgIndex.tcl
diff --git a/graphviz-gv_aliasing.patch b/graphviz-gv_aliasing.patch
deleted file mode 100644
index d598adc..0000000
--- a/graphviz-gv_aliasing.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- tclpkg/gv/Makefile.am	2007/02/01 12:47:35	1.1
-+++ tclpkg/gv/Makefile.am	2007/05/08 09:25:17
-@@ -56,6 +56,8 @@
- LUA_hdr = 
- nodist_libgv_lua_la_SOURCES = gv_lua.cpp $(LUA_hdr)
- libgv_lua_la_SOURCES = $(BASESOURCES)
-+#libgv_lua_la_CFLAGS = -fno-strict-aliasing
-+libgv_lua_la_CXXFLAGS = -fno-strict-aliasing
- libgv_lua_la_LIBADD = $(BASELIBS) @LUA_LIBS@
- libgv_lua_la_LDFLAGS = 
- gv_lua.cpp $(LUA_hdr): gv.i
-@@ -74,6 +76,8 @@
- PERL_hdr = gv.pm
- nodist_libgv_perl_la_SOURCES = gv_perl.cpp $(PERL_hdr)
- libgv_perl_la_SOURCES = $(BASESOURCES)
-+#libgv_perl_la_CFLAGS = -fno-strict-aliasing
-+libgv_perl_la_CXXFLAGS = -fno-strict-aliasing
- libgv_perl_la_LIBADD = $(BASELIBS) @PERL_LIBS@
- libgv_perl_la_LDFLAGS = 
- gv_perl.cpp $(PERL_hdr): gv.i
-@@ -86,6 +86,7 @@
- pkgphpdir = $(pkglibdir)/php
- PHP_hdr = gv.php php_gv.h
- nodist_libgv_php_la_SOURCES = gv_php.cpp $(PHP_hdr)
-+libgv_php_la_CXXFLAGS = -fno-strict-aliasing
- libgv_php_la_SOURCES = $(BASESOURCES)
- libgv_php_la_LIBADD = $(BASELIBS) @PHP_LIBS@
- libgv_php_la_LDFLAGS = 
diff --git a/graphviz-missing_includes.patch b/graphviz-missing_includes.patch
index d957e99..3a9cff3 100644
--- a/graphviz-missing_includes.patch
+++ b/graphviz-missing_includes.patch
@@ -19,19 +19,3 @@
  	}
  }
  int getSplitCnt(IncVPSC *vpsc) {
---- lib/vpsc/generate-constraints.cpp
-+++ lib/vpsc/generate-constraints.cpp
-@@ -18,11 +18,13 @@
- 
- #include <set>
- #include <cassert>
-+#include <cstdlib>
- #include "generate-constraints.h"
- #include "constraint.h"
- 
- using std::set;
- using std::vector;
-+using std::qsort;
- 
- std::ostream& operator <<(std::ostream &os, const Rectangle &r) {
- 	os << "{"<<r.minX<<","<<r.maxX<<","<<r.minY<<","<<r.maxY<<"},";
diff --git a/graphviz-module_avoid-version.patch b/graphviz-module_avoid-version.patch
deleted file mode 100644
index d7e8243..0000000
--- a/graphviz-module_avoid-version.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- tclpkg/gv/Makefile.am	2007/08/29 12:36:07	1.19
-+++ tclpkg/gv/Makefile.am	2007/08/29 12:38:36
-@@ -19,7 +19,7 @@
- nodist_libgv_sharp_la_SOURCES = gv_sharp.cpp $(SHARP_hdr)
- libgv_sharp_la_SOURCES = $(BASESOURCES)
- libgv_sharp_la_LIBADD = $(BASELIBS) @SHARP_LIBS@ 
--libgv_sharp_la_LDFLAGS = 
-+libgv_sharp_la_LDFLAGS = -module -avoid-version
- gv_sharp.cpp $(SHARP_hdr): gv.i
- 	$(SWIG) -c++ -csharp -namespace gv -o gv_sharp.cpp $(srcdir)/gv.i
- 
-@@ -28,7 +28,7 @@
- nodist_libgv_guile_la_SOURCES = gv_guile.cpp $(GUILE_hdr)
- libgv_guile_la_SOURCES = $(BASESOURCES)
- libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@
--libgv_guile_la_LDFLAGS = 
-+libgv_guile_la_LDFLAGS = -module -avoid-version
- gv_guile.cpp $(GUILE_hdr): gv.i
- 	$(SWIG) -c++ -guile -o gv_guile.cpp $(srcdir)/gv.i
- 	$(SED) -e 's/SWIG_GUILE_INIT_STATIC void/void/' <gv_guile.cpp >t
-@@ -39,7 +39,7 @@
- nodist_libgv_io_la_SOURCES = gv_io.cpp $(IO_hdr)
- libgv_io_la_SOURCES = $(BASESOURCES)
- libgv_io_la_LIBADD = $(BASELIBS) @IO_LIBS@
--libgv_io_la_LDFLAGS = 
-+libgv_io_la_LDFLAGS = -module -avoid-version
- gv_io.cpp $(IO_hdr): gv.i
- 	$(SWIG) -c++ -io -o gv_io.cpp $(srcdir)/gv.i
- 
-@@ -48,7 +48,7 @@
- nodist_libgv_java_la_SOURCES = gv_java.cpp
- libgv_java_la_SOURCES = $(BASESOURCES) 
- libgv_java_la_LIBADD = $(BASELIBS) @JAVA_LIBS@
--libgv_java_la_LDFLAGS = 
-+libgv_java_la_LDFLAGS = -module -avoid-version
- gv_java.cpp $(JAVA_hdr): gv.i
- 	$(SWIG) -c++ -java -o gv_java.cpp $(srcdir)/gv.i
- 
-@@ -59,7 +59,7 @@
- #libgv_lua_la_CFLAGS = -fno-strict-aliasing
- libgv_lua_la_CXXFLAGS = -fno-strict-aliasing
- libgv_lua_la_LIBADD = $(BASELIBS) @LUA_LIBS@
--libgv_lua_la_LDFLAGS = 
-+libgv_lua_la_LDFLAGS = -module -avoid-version
- gv_lua.cpp $(LUA_hdr): gv.i
- 	$(SWIG) -c++ -lua -o gv_lua.cpp $(srcdir)/gv.i
- 
-@@ -68,7 +68,7 @@
- nodist_libgv_ocaml_la_SOURCES = gv_ocaml.cpp $(OCAML_hdr)
- libgv_ocaml_la_SOURCES = $(BASESOURCES)
- libgv_ocaml_la_LIBADD = $(BASELIBS) @OCAML_LIBS@
--libgv_ocaml_la_LDFLAGS = 
-+libgv_ocaml_la_LDFLAGS = -module -avoid-version
- gv_ocaml.cpp $(OCAML_hdr): gv.i
- 	$(SWIG) -c++ -ocaml -o gv_ocaml.cpp $(srcdir)/gv.i
- 
-@@ -79,7 +79,7 @@
- #libgv_perl_la_CFLAGS = -fno-strict-aliasing
- libgv_perl_la_CXXFLAGS = -fno-strict-aliasing
- libgv_perl_la_LIBADD = $(BASELIBS) @PERL_LIBS@
--libgv_perl_la_LDFLAGS = 
-+libgv_perl_la_LDFLAGS = -module -avoid-version
- gv_perl.cpp $(PERL_hdr): gv.i
- 	$(SWIG) -c++ -perl -o gv_perl.cpp $(srcdir)/gv.i
- 
-@@ -89,7 +89,7 @@
- libgv_php_la_CXXFLAGS = -fno-strict-aliasing
- libgv_php_la_SOURCES = $(BASESOURCES)
- libgv_php_la_LIBADD = $(BASELIBS) @PHP_LIBS@
--libgv_php_la_LDFLAGS = 
-+libgv_php_la_LDFLAGS = -module -avoid-version
- gv_php.cpp $(PHP_hdr): gv.i
- 	$(SWIG) -c++ -php -o gv_php.cpp $(srcdir)/gv.i
- 
-@@ -98,7 +98,7 @@
- nodist_libgv_python_la_SOURCES = gv_python.cpp $(PYTHON_hdr)
- libgv_python_la_SOURCES = $(BASESOURCES)
- libgv_python_la_LIBADD = $(BASELIBS) @PYTHON_LIBS@
--libgv_python_la_LDFLAGS = 
-+libgv_python_la_LDFLAGS = -module -avoid-version
- gv_python.cpp $(PYTHON_hdr): gv.i
- 	$(SWIG) -c++ -python -o gv_python.cpp $(srcdir)/gv.i
- 
-@@ -107,7 +107,7 @@
- nodist_libgv_ruby_la_SOURCES = gv_ruby.cpp $(RUBY_hdr)
- libgv_ruby_la_SOURCES = $(BASESOURCES)
- libgv_ruby_la_LIBADD = $(BASELIBS) @RUBY_LIBS@
--libgv_ruby_la_LDFLAGS = 
-+libgv_ruby_la_LDFLAGS = -module -avoid-version
- gv_ruby.cpp $(RUBY_hdr): gv.i
- 	$(SWIG) -c++ -ruby -o gv_ruby.cpp $(srcdir)/gv.i
- 
-@@ -116,7 +116,7 @@
- nodist_libgv_tcl_la_SOURCES = gv_tcl.cpp $(TCL_hdr)
- libgv_tcl_la_SOURCES = $(BASESOURCES)
- libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(BASELIBS) @TCL_LIBS@
--libgv_tcl_la_LDFLAGS = 
-+libgv_tcl_la_LDFLAGS = -module -avoid-version
- gv_tcl.cpp $(TCL_hdr): gv.i
- 	$(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
- 
diff --git a/graphviz-no_libtool_patching.patch b/graphviz-no_libtool_patching.patch
deleted file mode 100644
index c4991ec..0000000
--- a/graphviz-no_libtool_patching.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- autogen.sh
-+++ autogen.sh
-@@ -9,8 +9,6 @@
- #create an empty config/config.rpath else iconf configure test generates a warning
- touch config/config.rpath
- 
--patch -N -p0 <ltmain.sh.patch
--                                                                                
- # ensure COPYING is based on cpl1.0.txt
- #   cpl1.0.txt was obtained from: http://www.opensource.org/licenses/cpl1.0.txt
- rm -f COPYING
diff --git a/graphviz-php5_include_dirs.patch b/graphviz-php5_include_dirs.patch
deleted file mode 100644
index 2a37ddb..0000000
--- a/graphviz-php5_include_dirs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -633,7 +633,7 @@
- 	AC_MSG_WARN([swig does not support php. The PHP packages will not be built])
- else
- AC_CHECK_PROG(PHP,php,php)
--PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
-+PHP_INCLUDES="-I/usr/include/php5 -I/usr/include/php5/main -I/usr/include/php5/Zend -I/usr/include/php5/TSRM"
- PHP_LIBS=
- save_CPPFLAGS=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes
index 7913e98..6187dbd 100644
--- a/graphviz-plugins.changes
+++ b/graphviz-plugins.changes
@@ -1,3 +1,65 @@
+-------------------------------------------------------------------
+Fri Mar 28 12:53:29 CET 2008 - pth@suse.de
+
+- Update to 2.18. Changes since 2.12:
+  - Lots of bugs fixed, see ChangeLog for detailed list.
+  - in -Tps use a new number formatter that suppresses trailing 0.
+  - support tcl/tk-8.5
+  - support gcc-4.3
+  - support for node usershapes/images in svg format
+  - install: perl, php, python, ruby, tcl, bindings in
+    language-specified directories
+  - add arrowhead scaling with edge penwidth
+  - add "folder" node shape
+  - add "smyna" large graph view (thanks Arif) (not yet included
+    in binary distros)
+  
+  * 2.16.1
+  - Improvements to PHP binding
+  - Improvements to OCAML binding
+  - Make regression tests run from the build tree, rather than require
+    installation
+  - Repair freetype detection on RedHat-7 (Yes, people still use it!!)
+  - Fix zoom-at-mouse-location in -Txlib and -Tgtk
+  - Fix some dotty regressions
+  
+  * 2.15
+  - new regression test suite
+  - new cgraph library (will eventually replace graph and agraph)
+  - add "image" and "imagescale" for simpler support for images in nodes
+  - add "tab" "box3d" and "component" shapes.  - Diomidis Spinellis
+  - replace arith.h in distro
+  - add functions to access version info to avoid need for gvcint.h
+  - Fix problem with irregular character spacing at 96dpi in pango/cairo
+    output formats.
+  - Add gdk_pixbuf plugin providing: .bmp .ico .jpg .png .tif 
+  - Add DevIL plugin providing: .bmp .jpg .png .tif .tga
+  - Extend GD plugin to provide a backend to cairo for: .gif .jpg .png .gd
+    .gd2 .wbmp  <- gifs are now antialiased
+  - Rework plugin framework to separate device from renderer, and to
+    autoload load dependendent plugins
+  - show defaults in output from: ./configure --help
+  - add more info to dot -v  and dot -v2 debug outputs
+  - various issues with CR/LF in windows, but not in binary outputs.
+
+  * 2.14.1
+  - Add xdot parsing library to source distros
+  - graphviz.spec fixes for rpm distros from Gareth Armstrong
+  - moved language binding man pages to mann
+    (gv_php.n, gv_ocaml.n, etc.)
+  - New access functions for version info in GVC_t - permits
+    gvcint.h to be private.
+
+  * 2.14:  
+  - Using system version of libgd if gd-2.0.34 or later.
+    internal copy of gd updated to gd-2.0.35.
+  - Updated GVGUI viewer for Windows
+  - Added support for selection of edge routing types:
+    line, polyline, orthogonal, spline
+  - Added -Tvml support
+- Adapt the patch to allow ^LT_(CURRENT|REVISION|AGE)$ in
+  configure script and reenable the use of these variables.
+  
 -------------------------------------------------------------------
 Thu Mar 13 17:47:28 CET 2008 - schwab@suse.de
 
diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec
index f347cff..44d0a7f 100644
--- a/graphviz-plugins.spec
+++ b/graphviz-plugins.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package graphviz-plugins (Version 2.12)
+# spec file for package graphviz-plugins (Version 2.18)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -23,8 +23,8 @@ BuildRequires:  graphviz libgnomeui-devel php5-devel
 %if 0%{?suse_version} > 1020
 BuildRequires:  fdupes
 %endif
-Version:        2.12
-Release:        12
+Version:        2.18
+Release:        1
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -32,24 +32,22 @@ Source:         http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}
 #Source1:        %{name}-rpmlintrc
 Patch0:         graphviz-fix-pkgIndex.patch
 Patch1:         graphviz-aliasing-fixes.patch
-Patch3:         graphviz-fix_swig_template.patch
-Patch4:         graphviz-neato_splines.patch
-Patch7:         graphviz-strcmp_fix.patch
-# This fix will be in 2.13
-Patch8:         graphviz-2.11-php_check.patch
-Patch9:         graphviz-no_libtool_patching.patch
-Patch10:        graphviz-fix_manpages.patch
-Patch11:        graphviz-gv_aliasing.patch
-Patch12:        graphviz-php5_include_dirs.patch
-Patch13:        graphviz-codecleanup.patch
-Patch14:        graphviz-module_avoid-version.patch
-Patch15:        graphviz-missing_includes.patch
-Patch16:        graphviz-conf.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
 Url:            http://www.graphviz.org/
 License:        IBM Public License
 Prefix:         /usr
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 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}
 
 %description
 A collection of tools and tcl packages for the manipulation and layout
@@ -68,6 +66,7 @@ Authors:
     Gordon Woodhull <gmcw@worldnet.att.net>
 
 %package -n graphviz-gd
+License:        IBM Public License
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        Graphviz plugin for renderers based on gd
 Requires:       graphviz = %{version}-%{release} gd
@@ -88,6 +87,7 @@ Authors:
     Gordon Woodhull <gmcw@worldnet.att.net>
 
 %package -n graphviz-guile
+License:        IBM Public License
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        Graph Visualization Tools
 Requires:       graphviz = %{version}-%{release} guile
@@ -109,6 +109,7 @@ Authors:
     Gordon Woodhull <gmcw@worldnet.att.net>
 
 %package -n graphviz-java
+License:        IBM Public License
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        Graph Visualization Tools
 Requires:       graphviz = %{version}-%{release} java
@@ -130,6 +131,7 @@ Authors:
     Gordon Woodhull <gmcw@worldnet.att.net>
 
 %package -n graphviz-lua
+License:        IBM Public License
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        Lua extension for graphviz
 Requires:       graphviz = %{version}-%{release} lua
@@ -150,6 +152,7 @@ Authors:
     Gordon Woodhull <gmcw@worldnet.att.net>
 
 %package -n graphviz-ocaml
+License:        IBM Public License
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        OCAML extension for graphviz
 Requires:       graphviz = %{version}-%{release} ocaml
@@ -170,6 +173,7 @@ Authors:
     Gordon Woodhull <gmcw@worldnet.att.net>
 
 %package -n graphviz-perl
+License:        IBM Public License
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        Perl extension for Graphviz
 Requires:       graphviz = %{version}-%{release} perl
@@ -190,6 +194,7 @@ Authors:
     Gordon Woodhull <gmcw@worldnet.att.net>
 
 %package -n graphviz-php
+License:        IBM Public License
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        PHP Extension for Graphviz
 Requires:       graphviz = %{version}-%{release} php5
@@ -210,6 +215,7 @@ Authors:
     Gordon Woodhull <gmcw@worldnet.att.net>
 
 %package -n graphviz-python
+License:        IBM Public License
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        Python Extension for Graphviz
 Requires:       graphviz = %{version}-%{release} python
@@ -230,6 +236,7 @@ Authors:
     Gordon Woodhull <gmcw@worldnet.att.net>
 
 %package -n graphviz-ruby
+License:        IBM Public License
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        Ruby Extension for Graphviz
 Requires:       graphviz = %{version}-%{release} ruby
@@ -250,6 +257,7 @@ Authors:
     Gordon Woodhull <gmcw@worldnet.att.net>
 
 %package -n graphviz-sharp
+License:        IBM Public License
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        C# Extension for Graphviz
 Requires:       graphviz = %{version}-%{release} mono-core
@@ -270,6 +278,7 @@ Authors:
     Gordon Woodhull <gmcw@worldnet.att.net>
 
 %package -n graphviz-tcl
+License:        IBM Public License
 Group:          Development/Libraries/Tcl
 Summary:        Tcl extension tools for graphviz
 Requires:       graphviz = %{version}-%{release} tcl >= 8.3 tk
@@ -291,6 +300,7 @@ Authors:
     Gordon Woodhull <gmcw@worldnet.att.net>
 
 %package -n graphviz-doc
+License:        IBM Public License
 Group:          Productivity/Graphics/Visualization/Graph
 Summary:        Documentation for graphviz
 
@@ -313,18 +323,14 @@ Authors:
 %setup -q -n %{mname}-%{version}
 %patch
 %patch1
+%patch2
 %patch3
 %patch4
+%patch5
 %patch7
 %patch8
 %patch9
 %patch10
-%patch11
-%patch12
-%patch13
-%patch14
-%patch15
-%patch16
 # 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
@@ -370,7 +376,7 @@ find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 mkdir -p %{buildroot}/%{_docdir}
 mkdir -p %{buildroot}%{_datadir}/%{mname}
 mkdir -p %{buildroot}%{_datadir}/tcl/%{mname}
-mv %buildroot/%{_libdir}/%{mname}/pkgIndex.tcl %{buildroot}%{_datadir}/tcl/%{mname}/
+mv %buildroot/%{_libdir}/%{mname}/tcl/pkgIndex.tcl %{buildroot}%{_datadir}/tcl/%{mname}/
 chmod -x %{buildroot}%{_datadir}/%{mname}/lefty/*
 cp -a %{buildroot}%{_datadir}/%{mname}/doc __doc
 rm -rf %{buildroot}%{_datadir}/%{mname}/doc
@@ -383,25 +389,23 @@ done
 rm -f  %{buildroot}/usr/bin/*
 rm -rf %{buildroot}/usr/include/graphviz
 rm -f  %{buildroot}/usr/lib/graphviz/config
-rm -f  %{buildroot}/%{_libdir}/graphviz/libgvplugin_core*
-rm -f  %{buildroot}/%{_libdir}/graphviz/libgvplugin_dot_layout*
-rm -f  %{buildroot}/%{_libdir}/graphviz/libgvplugin_gd.so
-rm -f  %{buildroot}/%{_libdir}/graphviz/libgvplugin_gtk*
-rm -f  %{buildroot}/%{_libdir}/graphviz/libgvplugin_neato_layout*
-rm -f  %{buildroot}/%{_libdir}/graphviz/libgvplugin_pango*
-rm -f  %{buildroot}/%{_libdir}/graphviz/libgvplugin_xlib*
-rm -f  %{buildroot}/%{_libdir}/lib*
-rm -rf %{buildroot}/%{_libdir}/pkgconfig
+rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_core*
+rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_dot_layout*
+rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_gd.so
+rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_gtk*
+rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_neato_layout*
+rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_pango*
+rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_xlib*
+rm -f  %{buildroot}%{_libdir}/graphviz/libgvplugin_gdk_pixbuf*
+rm -f  %{buildroot}%{_libdir}/lib*
+rm -rf %{buildroot}%{_libdir}/pkgconfig
 rm -rf %{buildroot}/usr/share/graphviz/graphs
 rm -rf %{buildroot}/usr/share/graphviz/lefty
-rm -rf %{buildroot}/%{_mandir}/man1
-rm -f  %{buildroot}/%{_mandir}/man3/*.3.gz
-rm -f  %{buildroot}/%{_mandir}/man3/*.3
-mv %{buildroot}%{_libdir}/%{mname}/tcl/gv_tcl.man %{buildroot}%{_mandir}/mann/gv_tcl.n 
-mv %{buildroot}%{_libdir}/%{mname}/perl/gv_perl.man %{buildroot}%{_mandir}/man3/gv_perl.3pm
-for lang in ruby python lua ocaml sharp guile php; do
-    mv %{buildroot}%{_libdir}/%{mname}/$lang/gv_$lang.man %{buildroot}%{_mandir}/man3/gv_$lang.3
-done
+rm -rf %{buildroot}%{_mandir}/man1
+rm -f  %{buildroot}%{_mandir}/man3/*.3.gz
+rm -f  %{buildroot}%{_mandir}/man3/*.3
+rm -f  %{buildroot}%{_mandir}/man7/*.7
+rm -f  %{buildroot}%{_mandir}/man7/*.7.gz
 %if 0%{?suse_version} > 1020
 %fdupes -s %{buildroot}%{_docdir}
 %endif
@@ -422,7 +426,7 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 %files -n graphviz-guile
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/guile
-%doc %{_mandir}/man3/gv_guile.3.gz
+%doc %{_mandir}/mann/gv_guile.n.gz
 
 %files -n graphviz-java
 %defattr(-,root,root,-)
@@ -431,41 +435,49 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 %files -n graphviz-sharp
 %defattr(-,root,root)
 %{_libdir}/graphviz/sharp
-%doc %{_mandir}/man3/gv_sharp.3.gz
+%doc %{_mandir}/mann/gv_sharp.n.gz
 
 %files -n graphviz-lua
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/lua
-%doc %{_mandir}/man3/gv_lua.3.gz
+%doc %{_mandir}/mann/gv_lua.n.gz
 
 %files -n graphviz-ocaml
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/ocaml
-%doc %{_mandir}/man3/gv_ocaml.3.gz
+%doc %{_mandir}/mann/gv_ocaml.n.gz
 
 %files -n graphviz-perl
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/perl
-%doc %{_mandir}/man3/*.3pm*
+%{perl_vendorarch}/gv.pm
+%{perl_vendorarch}/gv.so
+%doc %{_mandir}/mann/gv_perl.n.gz
 
 %files -n graphviz-php
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/php
-%doc %{_mandir}/man3/gv_php.3.gz
+%{_libdir}/php/modules/gv.so
+%{_datadir}/php/gv.php
+%doc %{_mandir}/mann/gv_php.n.gz
 
 %files -n graphviz-python
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/python
-%doc %{_mandir}/man3/gv_python.3.gz
+%{py_sitedir}/_gv.so
+%{py_sitedir}/gv.py
+%doc %{_mandir}/mann/gv_python.n.gz
 
 %files -n graphviz-ruby
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/ruby
-%doc %{_mandir}/man3/gv_ruby.3.gz
+%{rb_sitedir}/%{_arch}-%{_os}/gv.so
+%doc %{_mandir}/mann/gv_ruby.n.gz
 
 %files -n graphviz-tcl
 %defattr(-,root,root)
 %dir %{_datadir}/tcl/%{mname}
+%dir %{_libdir}/tcl%{tcl_version}/graphviz-%{version}
 %{_libdir}/graphviz/tcl
 %{_datadir}/tcl/%{mname}/pkgIndex.tcl
 %{_datadir}/graphviz/demo
@@ -477,6 +489,61 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 %doc __doc/*
 
 %changelog
+* Fri Mar 28 2008 pth@suse.de
+- Update to 2.18. Changes since 2.12:
+  - Lots of bugs fixed, see ChangeLog for detailed list.
+  - in -Tps use a new number formatter that suppresses trailing 0.
+  - support tcl/tk-8.5
+  - support gcc-4.3
+  - support for node usershapes/images in svg format
+  - install: perl, php, python, ruby, tcl, bindings in
+  language-specified directories
+  - add arrowhead scaling with edge penwidth
+  - add "folder" node shape
+  - add "smyna" large graph view (thanks Arif) (not yet included
+  in binary distros)
+  * 2.16.1
+  - Improvements to PHP binding
+  - Improvements to OCAML binding
+  - Make regression tests run from the build tree, rather than require
+  installation
+  - Repair freetype detection on RedHat-7 (Yes, people still use it!!)
+  - Fix zoom-at-mouse-location in -Txlib and -Tgtk
+  - Fix some dotty regressions
+  * 2.15
+  - new regression test suite
+  - new cgraph library (will eventually replace graph and agraph)
+  - add "image" and "imagescale" for simpler support for images in nodes
+  - add "tab" "box3d" and "component" shapes.  - Diomidis Spinellis
+  - replace arith.h in distro
+  - add functions to access version info to avoid need for gvcint.h
+  - Fix problem with irregular character spacing at 96dpi in pango/cairo
+  output formats.
+  - Add gdk_pixbuf plugin providing: .bmp .ico .jpg .png .tif
+  - Add DevIL plugin providing: .bmp .jpg .png .tif .tga
+  - Extend GD plugin to provide a backend to cairo for: .gif .jpg .png .gd
+  .gd2 .wbmp  <- gifs are now antialiased
+  - Rework plugin framework to separate device from renderer, and to
+  autoload load dependendent plugins
+  - show defaults in output from: ./configure --help
+  - add more info to dot -v  and dot -v2 debug outputs
+  - various issues with CR/LF in windows, but not in binary outputs.
+  * 2.14.1
+  - Add xdot parsing library to source distros
+  - graphviz.spec fixes for rpm distros from Gareth Armstrong
+  - moved language binding man pages to mann
+  (gv_php.n, gv_ocaml.n, etc.)
+  - New access functions for version info in GVC_t - permits
+  gvcint.h to be private.
+  * 2.14:
+  - Using system version of libgd if gd-2.0.34 or later.
+  internal copy of gd updated to gd-2.0.35.
+  - Updated GVGUI viewer for Windows
+  - Added support for selection of edge routing types:
+  line, polyline, orthogonal, spline
+  - Added -Tvml support
+- Adapt the patch to allow ^LT_(CURRENT|REVISION|AGE)$ in
+  configure script and reenable the use of these variables.
 * Thu Mar 13 2008 schwab@suse.de
 - Allow ^LT_(CURRENT|REVISION|AGE)$ in configure script.
 - Remove broken autoconf macros.
diff --git a/graphviz.changes b/graphviz.changes
index 0ebb0aa..f5563bd 100644
--- a/graphviz.changes
+++ b/graphviz.changes
@@ -1,3 +1,65 @@
+-------------------------------------------------------------------
+Fri Mar 28 12:53:29 CET 2008 - pth@suse.de
+
+- Update to 2.18. Changes since 2.12:
+  - Lots of bugs fixed, see ChangeLog for detailed list.
+  - in -Tps use a new number formatter that suppresses trailing 0.
+  - support tcl/tk-8.5
+  - support gcc-4.3
+  - support for node usershapes/images in svg format
+  - install: perl, php, python, ruby, tcl, bindings in
+    language-specified directories
+  - add arrowhead scaling with edge penwidth
+  - add "folder" node shape
+  - add "smyna" large graph view (thanks Arif) (not yet included
+    in binary distros)
+  
+  * 2.16.1
+  - Improvements to PHP binding
+  - Improvements to OCAML binding
+  - Make regression tests run from the build tree, rather than require
+    installation
+  - Repair freetype detection on RedHat-7 (Yes, people still use it!!)
+  - Fix zoom-at-mouse-location in -Txlib and -Tgtk
+  - Fix some dotty regressions
+  
+  * 2.15
+  - new regression test suite
+  - new cgraph library (will eventually replace graph and agraph)
+  - add "image" and "imagescale" for simpler support for images in nodes
+  - add "tab" "box3d" and "component" shapes.  - Diomidis Spinellis
+  - replace arith.h in distro
+  - add functions to access version info to avoid need for gvcint.h
+  - Fix problem with irregular character spacing at 96dpi in pango/cairo
+    output formats.
+  - Add gdk_pixbuf plugin providing: .bmp .ico .jpg .png .tif 
+  - Add DevIL plugin providing: .bmp .jpg .png .tif .tga
+  - Extend GD plugin to provide a backend to cairo for: .gif .jpg .png .gd
+    .gd2 .wbmp  <- gifs are now antialiased
+  - Rework plugin framework to separate device from renderer, and to
+    autoload load dependendent plugins
+  - show defaults in output from: ./configure --help
+  - add more info to dot -v  and dot -v2 debug outputs
+  - various issues with CR/LF in windows, but not in binary outputs.
+
+  * 2.14.1
+  - Add xdot parsing library to source distros
+  - graphviz.spec fixes for rpm distros from Gareth Armstrong
+  - moved language binding man pages to mann
+    (gv_php.n, gv_ocaml.n, etc.)
+  - New access functions for version info in GVC_t - permits
+    gvcint.h to be private.
+
+  * 2.14:  
+  - Using system version of libgd if gd-2.0.34 or later.
+    internal copy of gd updated to gd-2.0.35.
+  - Updated GVGUI viewer for Windows
+  - Added support for selection of edge routing types:
+    line, polyline, orthogonal, spline
+  - Added -Tvml support
+- Adapt the patch to allow ^LT_(CURRENT|REVISION|AGE)$ in
+  configure script and reenable the use of these variables.
+  
 -------------------------------------------------------------------
 Thu Mar 13 18:36:18 CET 2008 - schwab@suse.de
 
diff --git a/graphviz.spec b/graphviz.spec
index 869edce..b59609e 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package graphviz (Version 2.12)
+# spec file for package graphviz (Version 2.18)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -16,8 +16,9 @@ BuildRequires:  freetype2-devel >= 2 gcc-c++ ksh libstdc++-devel
 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
-Version:        2.12
-Release:        95
+PreReq:         /bin/rm
+Version:        2.18
+Release:        1
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -25,17 +26,14 @@ Source:         http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.
 Source2:        graphviz-rpmlintrc
 Patch0:         graphviz-fix-pkgIndex.patch
 Patch1:         graphviz-aliasing-fixes.patch
-Patch3:         graphviz-fix_swig_template.patch
-Patch4:         graphviz-neato_splines.patch
-Patch7:         graphviz-strcmp_fix.patch
-# This fix will be in 2.13
-Patch8:         graphviz-2.11-php_check.patch
-Patch9:         graphviz-no_libtool_patching.patch
-Patch10:        graphviz-fix_manpages.patch
-Patch11:        graphviz-gv_aliasing.patch
-Patch12:        graphviz-codecleanup.patch
-Patch13:        graphviz-missing_includes.patch
-Patch14:        graphviz-conf.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
 Url:            http://www.graphviz.org/
 License:        IBM Public License
 Prefix:         /usr
@@ -60,6 +58,7 @@ Authors:
     Gordon Woodhull <gmcw@worldnet.att.net>
 
 %package devel
+License:        IBM Public License
 Group:          Development/Libraries/C and C++
 Summary:        Graphiviz development package
 Requires:       %{name} = %{version}
@@ -87,16 +86,15 @@ Authors:
 %setup -q
 %patch
 %patch1
+%patch2
 %patch3
 %patch4
+%patch5
+#%patch6
 %patch7
 %patch8
 %patch9
 %patch10
-%patch11
-%patch12
-%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
@@ -137,7 +135,7 @@ make install \
 	DESTDIR=%{buildroot} \
 	docdir=%{buildroot}%{_docdir}/%{name} \
 	pkgconfigdir=%{_libdir}/pkgconfig
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.la" -print0 | xargs -0 rm -f
 mkdir -p %{buildroot}/%{_docdir}
 mkdir -p %{buildroot}%{_datadir}/%{name}
 rm -f %buildroot/%{_libdir}/%{name}/pkgIndex.tcl
@@ -164,18 +162,19 @@ EOF
 for manfile in $(find %{buildroot} -name \*.man); do
     sed -e 's$/usr/lib/graphviz$%{_libdir}/%{name}$g' $manfile > ${manfile}.new && mv ${manfile}.new ${manfile}
 done
+#find %{buildroot}%{_libdir}/graphviz -type d | xargs rm -rf
 
 %clean
 rm -rf %buildroot
 
 %post
+/sbin/ldconfig
 # run "dot -c" to generate plugin config in %{_libdir}/graphviz/config
-%{_bindir}/dot -c
-test -s %{_libdir}/graphviz/config || exit 1
-%run_ldconfig
-# if there is no dot after everything else is done, the remove config
+dot -c
+test -s %{_libdir}/graphviz/config || echo "%{_libdir}/graphviz/config doesn't exist! Check installation."
 
 %postun
+/sbin/ldconfig
 if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_lib}/graphviz/config; fi
 
 %files
@@ -186,14 +185,17 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/lefty
 %{_datadir}/%{name}/graphs
-%{_mandir}/man1/*.1*
+%doc %{_mandir}/man1/*.1*
+%doc %{_mandir}/man7/*.7*
 %dir %{_libdir}/%{name}
 %dir %{_prefix}/lib/%{name}
 %{_libdir}/*.so.*
 %{_libdir}/graphviz/*.so.*
+%{_libdir}/graphviz/libgvplugin_core.so
+%{_libdir}/graphviz/libgvplugin_*_layout.so
 /etc/ld.so.conf.d/graphviz.conf
 %ghost /usr/lib/graphviz/config
-%exclude %{_libdir}/graphviz/*/*
+#%exclude %{_libdir}/graphviz/*/*
 %exclude %{_libdir}/graphviz/libgvplugin_gd.*
 
 %files devel
@@ -202,11 +204,66 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man3/*.3.gz
-%exclude %{_libdir}/graphviz/*/*
-%exclude %{_libdir}/graphviz/libgvplugin*
-%exclude %{_libdir}/graphviz/*.so
+#%exclude %{_libdir}/graphviz/*/*
+#%exclude %{_libdir}/graphviz/libgvplugin*
+#%exclude %{_libdir}/graphviz/*.so
 
 %changelog
+* Fri Mar 28 2008 pth@suse.de
+- Update to 2.18. Changes since 2.12:
+  - Lots of bugs fixed, see ChangeLog for detailed list.
+  - in -Tps use a new number formatter that suppresses trailing 0.
+  - support tcl/tk-8.5
+  - support gcc-4.3
+  - support for node usershapes/images in svg format
+  - install: perl, php, python, ruby, tcl, bindings in
+  language-specified directories
+  - add arrowhead scaling with edge penwidth
+  - add "folder" node shape
+  - add "smyna" large graph view (thanks Arif) (not yet included
+  in binary distros)
+  * 2.16.1
+  - Improvements to PHP binding
+  - Improvements to OCAML binding
+  - Make regression tests run from the build tree, rather than require
+  installation
+  - Repair freetype detection on RedHat-7 (Yes, people still use it!!)
+  - Fix zoom-at-mouse-location in -Txlib and -Tgtk
+  - Fix some dotty regressions
+  * 2.15
+  - new regression test suite
+  - new cgraph library (will eventually replace graph and agraph)
+  - add "image" and "imagescale" for simpler support for images in nodes
+  - add "tab" "box3d" and "component" shapes.  - Diomidis Spinellis
+  - replace arith.h in distro
+  - add functions to access version info to avoid need for gvcint.h
+  - Fix problem with irregular character spacing at 96dpi in pango/cairo
+  output formats.
+  - Add gdk_pixbuf plugin providing: .bmp .ico .jpg .png .tif
+  - Add DevIL plugin providing: .bmp .jpg .png .tif .tga
+  - Extend GD plugin to provide a backend to cairo for: .gif .jpg .png .gd
+  .gd2 .wbmp  <- gifs are now antialiased
+  - Rework plugin framework to separate device from renderer, and to
+  autoload load dependendent plugins
+  - show defaults in output from: ./configure --help
+  - add more info to dot -v  and dot -v2 debug outputs
+  - various issues with CR/LF in windows, but not in binary outputs.
+  * 2.14.1
+  - Add xdot parsing library to source distros
+  - graphviz.spec fixes for rpm distros from Gareth Armstrong
+  - moved language binding man pages to mann
+  (gv_php.n, gv_ocaml.n, etc.)
+  - New access functions for version info in GVC_t - permits
+  gvcint.h to be private.
+  * 2.14:
+  - Using system version of libgd if gd-2.0.34 or later.
+  internal copy of gd updated to gd-2.0.35.
+  - Updated GVGUI viewer for Windows
+  - Added support for selection of edge routing types:
+  line, polyline, orthogonal, spline
+  - Added -Tvml support
+- Adapt the patch to allow ^LT_(CURRENT|REVISION|AGE)$ in
+  configure script and reenable the use of these variables.
 * Thu Mar 13 2008 schwab@suse.de
 - Allow ^LT_(CURRENT|REVISION|AGE)$ in configure script.
 - Remove broken autoconf macros.