diff --git a/graphviz-conf.patch b/graphviz-conf.patch
new file mode 100644
index 0000000..fe48216
--- /dev/null
+++ b/graphviz-conf.patch
@@ -0,0 +1,10 @@
+--- 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-plugins.changes b/graphviz-plugins.changes
index ee766d7..7913e98 100644
--- a/graphviz-plugins.changes
+++ b/graphviz-plugins.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 13 17:47:28 CET 2008 - schwab@suse.de
+
+- Allow ^LT_(CURRENT|REVISION|AGE)$ in configure script.
+- Remove broken autoconf macros.
+
 -------------------------------------------------------------------
 Fri Oct 26 17:34:08 CEST 2007 - pth@suse.de
 
diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec
index f5d7fd7..f347cff 100644
--- a/graphviz-plugins.spec
+++ b/graphviz-plugins.spec
@@ -1,16 +1,16 @@
 #
 # spec file for package graphviz-plugins (Version 2.12)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 # nodebuginfo
 
+
 Name:           graphviz-plugins
 %define mname graphviz
 BuildRequires:  libexpat-devel libjpeg-devel libpng-devel zlib-devel
@@ -24,7 +24,7 @@ BuildRequires:  graphviz libgnomeui-devel php5-devel
 BuildRequires:  fdupes
 %endif
 Version:        2.12
-Release:        11
+Release:        12
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -44,6 +44,7 @@ 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
 Url:            http://www.graphviz.org/
 License:        IBM Public License
 Prefix:         /usr
@@ -323,8 +324,12 @@ Authors:
 %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
+rm m4/iconv.m4 m4/lib-*.m4
+cp /usr/share/gettext/config.rpath config
 
 %build
 ./autogen.sh
@@ -470,26 +475,30 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 %docdir %{_defaultdocdir}/%{mname}
 %defattr(-,root,root,-)
 %doc __doc/*
+
 %changelog
-* Fri Oct 26 2007 - pth@suse.de
+* Thu Mar 13 2008 schwab@suse.de
+- Allow ^LT_(CURRENT|REVISION|AGE)$ in configure script.
+- Remove broken autoconf macros.
+* Fri Oct 26 2007 pth@suse.de
 - Add missing includes.
-* Thu Aug 16 2007 - pth@suse.de
+* Thu Aug 16 2007 pth@suse.de
 - Add missing BuildRequires for fdupes
 - Guard fdupes by check for suse_version
-* Mon Aug 13 2007 - pth@suse.de
+* Mon Aug 13 2007 pth@suse.de
 - lib/sfio/sfhdr.h(SFSETLOCALE): fix test for null pointer.
 - Fix include paths for php5
 - Move gv_php man page to where man searches for it.
 - Use %%fdupes
 - Add rpmlintrc
 - use -fno-strict-aliasing for gv_php
-* Mon Jun 11 2007 - ro@suse.de
+* Mon Jun 11 2007 ro@suse.de
 - no main package, no debuginfo
-* Wed Jun 06 2007 - pth@suse.de
+* Wed Jun 06 2007 pth@suse.de
 - Move man pages to _mandir (bugzilla #281398)
-* Fri May 11 2007 - ro@suse.de
+* Fri May 11 2007 ro@suse.de
 - added get_release_number.sh to sync rel-number between
   graphviz and graphviz-plugins
-* Thu May 10 2007 - ro@suse.de
+* Thu May 10 2007 ro@suse.de
 - create own specfile for all plugins to reduce build dependencies
   of main package (and break various build cycles)
diff --git a/graphviz.changes b/graphviz.changes
index 80030ca..0ebb0aa 100644
--- a/graphviz.changes
+++ b/graphviz.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 13 18:36:18 CET 2008 - schwab@suse.de
+
+- Allow ^LT_(CURRENT|REVISION|AGE)$ in configure script.
+- Remove broken autoconf macros.
+
 -------------------------------------------------------------------
 Fri Oct 26 17:33:40 CEST 2007 - pth@suse.de
 
diff --git a/graphviz.spec b/graphviz.spec
index 41b96d2..869edce 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -1,14 +1,14 @@
 #
 # spec file for package graphviz (Version 2.12)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
+
 
 Name:           graphviz
 BuildRequires:  fdupes libexpat-devel libjpeg-devel libpng-devel zlib-devel
@@ -17,7 +17,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
 Version:        2.12
-Release:        59
+Release:        95
 AutoReqProv:    on
 Summary:        Graph Visualization Tools
 Group:          Productivity/Graphics/Visualization/Graph
@@ -35,6 +35,7 @@ Patch10:        graphviz-fix_manpages.patch
 Patch11:        graphviz-gv_aliasing.patch
 Patch12:        graphviz-codecleanup.patch
 Patch13:        graphviz-missing_includes.patch
+Patch14:        graphviz-conf.patch
 Url:            http://www.graphviz.org/
 License:        IBM Public License
 Prefix:         /usr
@@ -95,8 +96,12 @@ Authors:
 %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
+rm m4/iconv.m4 m4/lib-*.m4
+cp /usr/share/gettext/config.rpath config
 
 %build
 ./autogen.sh
@@ -200,18 +205,22 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 %exclude %{_libdir}/graphviz/*/*
 %exclude %{_libdir}/graphviz/libgvplugin*
 %exclude %{_libdir}/graphviz/*.so
+
 %changelog
-* Fri Oct 26 2007 - pth@suse.de
+* Thu Mar 13 2008 schwab@suse.de
+- Allow ^LT_(CURRENT|REVISION|AGE)$ in configure script.
+- Remove broken autoconf macros.
+* Fri Oct 26 2007 pth@suse.de
 - Add missing includes.
-* Mon Aug 13 2007 - pth@suse.de
+* Mon Aug 13 2007 pth@suse.de
 - lib/sfio/sfhdr.h(SFSETLOCALE): fix test for null pointer.
 - use -fno-strict-aliasing for gv_php
-* Fri May 11 2007 - ro@suse.de
+* Fri May 11 2007 ro@suse.de
 - added get_release_number.sh to sync rel-number between
   graphviz and graphviz-plugins
-* Thu May 10 2007 - ro@suse.de
+* Thu May 10 2007 ro@suse.de
 - split off plugins to separate specfile to break build cycles
-* Tue May 08 2007 - pth@suse.de
+* Tue May 08 2007 pth@suse.de
 - Update to 2.12
   - PostScript output had an extraneous '%%' character on the first line,
   which would cause printing to fail.
@@ -283,41 +292,41 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 - Use SONAMEs to generate pkgIndex.tcl. That way tcl can actually
   load the libraries via 'package require'
 - Don't compare pointer with string literal.
-* Thu May 03 2007 - prusnak@suse.cz
+* Thu May 03 2007 prusnak@suse.cz
 - changed expat to libexpat-devel in [Build]Requires
-* Thu Mar 29 2007 - aj@suse.de
+* Thu Mar 29 2007 aj@suse.de
 - Add bison to BuildRequires.
-* Fri Aug 11 2006 - pth@suse.de
+* Fri Aug 11 2006 pth@suse.de
 - Adapt to new X11 paths.
-* Mon Apr 03 2006 - pnemec@suse.cz
+* Mon Apr 03 2006 pnemec@suse.cz
 - add pkgconfig files to devel package
-* Sun Feb 19 2006 - aj@suse.de
+* Sun Feb 19 2006 aj@suse.de
 - Reduce BuildRequires.
-* Thu Feb 09 2006 - pth@suse.de
+* Thu Feb 09 2006 pth@suse.de
 - Fix segfault in neato when using splines (#144275)
-* Fri Feb 03 2006 - pth@suse.de
+* Fri Feb 03 2006 pth@suse.de
 - Fix swig template to include declaration.
 - Fix BuildRequires
 - Fix dependencies for -devel package
-* Thu Nov 24 2005 - agruen@suse.de
+* Thu Nov 24 2005 agruen@suse.de
 - Add missing plugin config file.
 - Fix gcc aliasing bugs.
-* Mon Aug 29 2005 - agruen@suse.de
+* Mon Aug 29 2005 agruen@suse.de
 - Update to version 2.6: numerous bugfixes.
-* Tue Aug 09 2005 - agruen@suse.de
+* Tue Aug 09 2005 agruen@suse.de
 - fix-pkgIndex.diff: Fix tcl library search for "package require
   Tkspline" and similar statements by (a) moving the tcl/tk
   libraries from _libdir/graphviz/ to _libdir/, and removing
   path names from library names in pkgIndex.tcl so that 32bit
   and 64bit libraries are searched as appropriate.
-* Tue Aug 02 2005 - ro@suse.de
+* Tue Aug 02 2005 ro@suse.de
 - move pkgIndex.tcl to /usr/share
-* Thu Feb 10 2005 - agruen@suse.de
+* Thu Feb 10 2005 agruen@suse.de
 - Update to version 2.2.
 - Drop graphviz-graphs subpackage.
-* Sun Aug 29 2004 - garloff@suse.de
+* Sun Aug 29 2004 garloff@suse.de
 - Drop EULA notification message.
-* Sat Mar 27 2004 - sndirsch@suse.de
+* Sat Mar 27 2004 sndirsch@suse.de
 - update to graphviz-1.12
   * general
     - rename bcc -> bcomps to avoid name conflict with
@@ -332,53 +341,53 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
   directories were dropped upstream (see 1.12 changelog above)
 - no need to rename bcc any longer (see 1.12 changelog above)
 - removed libtcldgl/libtcldgr (see 1.12 changelog above)
-* Tue Mar 09 2004 - garloff@suse.de
+* Tue Mar 09 2004 garloff@suse.de
 - Rename bcc to bcc-graphviz due to conflict with bcc from dev86.
-* Mon Mar 01 2004 - garloff@suse.de
+* Mon Mar 01 2004 garloff@suse.de
 - Update to graphviz-1.11:
   * Drop lots of patches (merged upstream) ;-)
   * dotneato: add -Gviewport, fix memleak in gdft, clean up calc
   of whitespace around labels
-* Wed Feb 25 2004 - garloff@suse.de
+* Wed Feb 25 2004 garloff@suse.de
 - Update to graphviz-1.10:
   * enhanced gpr: string matching, lock primitive to save graphs
   * zoomable 2 1/2 D graph viewer (Java)
   * neato -gpack
-* Fri Jan 16 2004 - meissner@suse.de
+* Fri Jan 16 2004 meissner@suse.de
 - Change freetype detection to new one, so the internal libGD is build
   against it again.
-* Sat Jan 10 2004 - adrian@suse.de
+* Sat Jan 10 2004 adrian@suse.de
 - build as user
-* Mon Oct 06 2003 - kukuk@suse.de
+* Mon Oct 06 2003 kukuk@suse.de
 - Remove curl (source code does not use it) and lynx from
   neededforbuild.
-* Mon Jul 28 2003 - ro@suse.de
+* Mon Jul 28 2003 ro@suse.de
 - updated neededforbuild
-* Tue May 13 2003 - pthomas@suse.de
+* Tue May 13 2003 pthomas@suse.de
 - Add hacks to work around problems with libtool 1.5.
-* Mon Apr 14 2003 - pthomas@suse.de
+* Mon Apr 14 2003 pthomas@suse.de
 - Get rid of nearly all compiler warnings.
-* Mon Apr 07 2003 - pthomas@suse.de
+* Mon Apr 07 2003 pthomas@suse.de
 - Use posix-2001 conforming syntax for sort.
-* Fri Feb 07 2003 - pthomas@suse.de
+* Fri Feb 07 2003 pthomas@suse.de
 - Update to 1.9
 - Split off subpackages devel, graphs and tcl like
   it's done in the specfile included with graphviz.
 - remove obsolete patches
-* Wed Jan 29 2003 - ro@suse.de
+* Wed Jan 29 2003 ro@suse.de
 - fix png library detection in configure
 - removed perl-GD and blt from neededforbuild
-* Thu Jan 09 2003 - ro@suse.de
+* Thu Jan 09 2003 ro@suse.de
 - fixed configure.in
-* Thu Nov 14 2002 - tcrhak@suse.cz
+* Thu Nov 14 2002 tcrhak@suse.cz
 - fixed for new bison: end rules with semicolons
-* Tue Aug 20 2002 - mmj@suse.de
+* Tue Aug 20 2002 mmj@suse.de
 - Correct PreReq
-* Sat Aug 10 2002 - aj@suse.de
+* Sat Aug 10 2002 aj@suse.de
 - Fix typo in license.
-* Fri Jul 05 2002 - kukuk@suse.de
+* Fri Jul 05 2002 kukuk@suse.de
 - Use %%ix86 macro
-* Tue Jul 02 2002 - garloff@suse.de
+* Tue Jul 02 2002 garloff@suse.de
 - Update to 1.8.6:
   * FPU handling fix got included
   * arch independent stuff in /usr/share/graphviz now
@@ -386,12 +395,12 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
   * new pack option to neato
   * bugfixes
 - Change licensor from SuSE GmbH to SuSE Linux AG
-* Wed May 22 2002 - garloff@suse.de
+* Wed May 22 2002 garloff@suse.de
 - Add prune binary and man page to file list.
-* Fri May 10 2002 - garloff@suse.de
+* Fri May 10 2002 garloff@suse.de
 - Fix FPU excpetion handling. (Use feenableexcept() rather than
   _FPU_GETCW(), if available.)
-* Wed May 08 2002 - garloff@suse.de
+* Wed May 08 2002 garloff@suse.de
 - Update to graphviz-1.8.5:
   * fixed various Win and MacOSX probs
   * minimal Type1 font support
@@ -399,32 +408,32 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
   * various SVG enhancements and fixes
   * various portability/64bit fixes
   * various bug fixes
-* Fri May 03 2002 - meissner@suse.de
+* Fri May 03 2002 meissner@suse.de
 - %%_lib fixes (to find tclConfig.sh and tkConfig.sh)
-* Fri Feb 01 2002 - ro@suse.de
+* Fri Feb 01 2002 ro@suse.de
 - changed neededforbuild <libpng> to <libpng-devel-packages>
-* Mon Jan 28 2002 - garloff@suse.de
+* Mon Jan 28 2002 garloff@suse.de
 - Some more missing decls found and fixed.
-* Mon Jan 28 2002 - garloff@suse.de
+* Mon Jan 28 2002 garloff@suse.de
 - Added patch to fix lots of warnings (and potential bugs on 64bit
   platforms).
-* Mon Jan 28 2002 - garloff@suse.de
+* Mon Jan 28 2002 garloff@suse.de
 - Pass TK_DEFS to gcc for tkspline (which uses tkInt.h)
-* Mon Jan 28 2002 - garloff@suse.de
+* Mon Jan 28 2002 garloff@suse.de
 - Update to 1.7.16:
   * Various bug fixes
   * Support for xfig, svgz,
   * Text output improvements
   * New twopi tool
 - Drop patches that have been included in official source ball.
-* Wed May 23 2001 - garloff@suse.de
+* Wed May 23 2001 garloff@suse.de
 - Fix cast warnings on 64bit archs and add missing includes
   where necessary.
-* Wed May 09 2001 - garloff@suse.de
+* Wed May 09 2001 garloff@suse.de
 - Cleanup patches.
-* Tue May 08 2001 - mfabian@suse.de
+* Tue May 08 2001 mfabian@suse.de
 - bzip2 sources
-* Mon Apr 30 2001 - garloff@suse.de
+* Mon Apr 30 2001 garloff@suse.de
 - Update to release 1.7.6 with lots of bugfixes:
   * Lots of font related fixes
   * Fix various bugs WRT labels
@@ -436,53 +445,53 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
   * New graph processing tools: acyclic, ccomps, colorize, gc,
   gpr, nop, sccmap, tred, unflatten (See ChangeLog for details)
 - Spec file: Consistently use %%{prefix}
-* Thu Mar 22 2001 - ro@suse.de
+* Thu Mar 22 2001 ro@suse.de
 - changed neededforbuild to freetype2
 - updated to 1.7.5 for freetype2
-* Mon Feb 26 2001 - uli@suse.de
+* Mon Feb 26 2001 uli@suse.de
 - fixed for new glibc
-* Fri Jan 19 2001 - garloff@suse.de
+* Fri Jan 19 2001 garloff@suse.de
 - Assorted patches from Stephen C. North to
   * fix runtime error in graphs having multiple nodes in the min
   or max rank set
   * fix layout thinko (mincross)
-* Sat Dec 16 2000 - garloff@suse.de
+* Sat Dec 16 2000 garloff@suse.de
 - Update to 1.7.4:
   * various fixes
   * support various linestyles
   * Remove Tcldot dependence on libgdtclft
   * support for long label strings (fixing a reported crash)
-* Tue Dec 12 2000 - garloff@suse.de
+* Tue Dec 12 2000 garloff@suse.de
 - Specfile cleanups.
-* Mon Dec 11 2000 - garloff@suse.de
+* Tue Dec 12 2000 garloff@suse.de
 - Update to 1.7.3:
   * Better font drawing support
   * Bugfixes
 - Removed most explicit Requires: from spec, as AutoReqProv works
   just fine.
 - Split off webdot.
-* Wed Nov 29 2000 - ro@suse.de
+* Wed Nov 29 2000 ro@suse.de
 - changed neededforbuild <tcld> to <tcl-devel>
-* Wed Nov 08 2000 - ro@suse.de
+* Wed Nov 08 2000 ro@suse.de
 - fixed neededforbuild gd -> perl-GD
-* Wed Nov 01 2000 - garloff@suse.de
+* Wed Nov 01 2000 garloff@suse.de
 - Use %%{?suse_update_config} -> support for S/390 added
-* Tue Oct 31 2000 - garloff@suse.de
+* Tue Oct 31 2000 garloff@suse.de
 - Update to 1.7: * dot/neato again separate binaries
   * 64 bit patches integrated
   * Some bugfixes and feature enhancements
-* Wed Oct 18 2000 - garloff@suse.de
+* Wed Oct 18 2000 garloff@suse.de
 - Change the wording of the license notification to match the
   wording from the letter from AT&T.
-* Tue Sep 19 2000 - garloff@suse.de
+* Tue Sep 19 2000 garloff@suse.de
 - Cleanups for 64 bit archs.
-* Mon Sep 18 2000 - garloff@suse.de
+* Mon Sep 18 2000 garloff@suse.de
 - Add a notification for the sysadmin, that (s)he and the users
   need to agree with the license termn in MINTERMS.txt. According
   to "Stephen C. North" <north@research.att.com>, this is all that
   needs to be done to fulfill the license requirements.
-* Wed Sep 06 2000 - garloff@suse.de
+* Wed Sep 06 2000 garloff@suse.de
 - LICENSOR is SuSE: Filled in MINTERMS.txt
-* Tue Sep 05 2000 - garloff@suse.de
+* Tue Sep 05 2000 garloff@suse.de
 - Creation of package graphviz-1.6
 - Fix lneato Makefile to install into $DESTDIR