diff --git a/graphviz-2.34.0.tar.gz b/graphviz-2.34.0.tar.gz
deleted file mode 100644
index e82040b..0000000
--- a/graphviz-2.34.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d94abca5745aa4c5808ab56cd3d0ec9ed14fb76a5a88d39e1f234fa84d22d764
-size 23921350
diff --git a/graphviz-2.38.0.tar.gz b/graphviz-2.38.0.tar.gz
new file mode 100644
index 0000000..0f44671
--- /dev/null
+++ b/graphviz-2.38.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef67859e
+size 25848858
diff --git a/graphviz-array_overflow.patch b/graphviz-array_overflow.patch
new file mode 100644
index 0000000..e8ae51d
--- /dev/null
+++ b/graphviz-array_overflow.patch
@@ -0,0 +1,19 @@
+---
+ lib/common/htmltable.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: lib/common/htmltable.c
+===================================================================
+--- lib/common/htmltable.c.orig	2014-04-13 22:40:25.000000000 +0200
++++ lib/common/htmltable.c	2014-05-23 00:01:41.203062717 +0200
+@@ -300,8 +300,8 @@ static void doBorder(GVJ_t * job, htmlda
+ 	    gvrender_polyline(job, AF+2, 4);
+ 	    break;
+ 	case BORDER_TOP|BORDER_LEFT|BORDER_BOTTOM :
+-	    AF[5] = AF[1];
+-	    AF[6] = AF[2];
++	    AF[4] = AF[1];
++	    AF[5] = AF[2];
+ 	    gvrender_polyline(job, AF+3, 4);
+ 	    break;
+ 	case BORDER_LEFT|BORDER_BOTTOM|BORDER_RIGHT :
diff --git a/graphviz-fix-includes.patch b/graphviz-fix-includes.patch
deleted file mode 100644
index c70af68..0000000
--- a/graphviz-fix-includes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/common/types.h.in
-===================================================================
---- lib/common/types.h.in.orig	2013-09-07 03:11:41.000000000 +0200
-+++ lib/common/types.h.in	2013-12-11 17:12:07.000000000 +0100
-@@ -46,7 +46,7 @@ extern "C" {
-     typedef int (*bsearch_cmpf) (const void *, const void *);
- 
- #ifdef WITH_CGRAPH
--#include <cgraph.h>
-+#include "cgraph.h"
-     typedef struct Agraph_s graph_t;
-     typedef struct Agnode_s node_t;
-     typedef struct Agedge_s edge_t;
diff --git a/graphviz-getaddrinfo.patch b/graphviz-getaddrinfo.patch
deleted file mode 100644
index 17a68fd..0000000
--- a/graphviz-getaddrinfo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
----
- cmd/lefty/os/unix/io.c |   43 +++++++++++++++++++++++++++++++------------
- 1 file changed, 31 insertions(+), 12 deletions(-)
-
-Index: cmd/lefty/os/unix/io.c
-===================================================================
---- cmd/lefty/os/unix/io.c.orig	2013-09-07 03:07:52.000000000 +0200
-+++ cmd/lefty/os/unix/io.c	2013-10-29 18:18:55.989590810 +0100
-@@ -285,27 +285,46 @@ int IOwriteline (int ioi, char *bufp) {
- 
- static FILE *serverconnect (char *name) {
-     char *host, *portp, buf[1024];
--    int port;
--    struct hostent *hp;
--    struct sockaddr_in sin;
-     int cfd;
-+    struct addrinfo hints;
-+    struct addrinfo *result, *rp;
-+
-+    memset(&hints, 0, sizeof(struct addrinfo));
-+
-+    hints.ai_family = AF_UNSPEC;    /* Allow IPv4 or IPv6 */
-+    hints.ai_socktype = SOCK_STREAM;/* Stream socket */
-+    hints.ai_flags = AI_PASSIVE;    /* For wildcard IP address */
-+    hints.ai_protocol = 0;          /* Any protocol */
-+    hints.ai_canonname = NULL;
-+    hints.ai_addr = NULL;
-+    hints.ai_next = NULL;
- 
-     strcpy (buf, name);
-     host = buf + 9;
-     portp = strchr (host, '/');
-+
-     if (*host == 0 || !portp)
-         return NULL;
--    *portp++ = 0, port = atoi (portp);
--    if (!(hp = gethostbyname (host)))
--        return NULL;
--    memset ((char *) &sin, 1, sizeof (sin));
--    memcpy ((char *) &sin.sin_addr, hp->h_addr, hp->h_length);
--    sin.sin_family = hp->h_addrtype;
--    sin.sin_port = htons (port);
--    if ((cfd = socket (hp->h_addrtype, SOCK_STREAM, 0)) < 0)
-+
-+    *portp++ = 0;
-+
-+    if (!(cfd = getaddrinfo(host, portp, &hints, &result)))
-         return NULL;
--    if (connect (cfd, (struct sockaddr *) &sin, sizeof (sin)) < 0)
-+
-+    for (rp = result; rp != NULL; rp = rp->ai_next) {
-+        cfd = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-+
-+        if (cfd == -1)
-+            continue;
-+        if (connect(cfd, rp->ai_addr, rp->ai_addrlen) != -1)
-+            break;                  /* Success */
-+    }
-+
-+    freeaddrinfo(result);
-+
-+    if (cfd < 0 || rp == NULL)
-         return NULL;
-+
-     return fdopen (cfd, "w+");
- }
- 
diff --git a/graphviz-gvedit.changes b/graphviz-gvedit.changes
index 5dda77b..614ed26 100644
--- a/graphviz-gvedit.changes
+++ b/graphviz-gvedit.changes
@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Thu Jul 17 23:14:32 CEST 2014 - pth@suse.de
+
+- Change License to EPL-1.0.
+
+-------------------------------------------------------------------
+Fri May 23 16:46:05 CEST 2014 - pth@suse.de
+
+- Fix URL to point to the new location of the sources.
+
+-------------------------------------------------------------------
+Fri May 23 14:23:57 CEST 2014 - pth@suse.de
+
+- Update to 2.38.0. Changes since 1.35.0:
+   - Resolve bugs: 2409, 2413, 2417, 2420, 2422, 2423, 2425
+   - Enable packing for dot
+   - Allow scaling to work for all non-dot layouts
+   - Add overline text characteristic.
+   - Fix bugs in gvpr and gv.cpp so edges can be created in subgraphs.
+   - Add edgepaint program for coloring edges to make them easier to
+     tell apart.
+   - Modify neato to avoid unnecessary translations of output. This
+     allows positions given on input to remain the same on output.
+   - Fix swig java package to work and support gv.renderresult.
+   - Fix test for the absence of layout (old test relied on statically
+     allocated Agraphinfo_t).
+   - HTML-like tables and cells can now specify which borders should be drawn.
+   - The fixedsize attribute now takes the value "shape" which allows
+     labels much larger than the node shape.
+
+- Remove graphviz-fix-includes.patch as the fix has been done 
+  upstream.
+- Add graphviz-array_overflow.patch to fix an off-by-one error.
+
+-------------------------------------------------------------------
+Fri Feb 28 15:45:07 CET 2014 - pth@suse.de
+
+- Fix graphviz-gvedit.changes by removing all entries that only
+  apply to graphviz.
+
+-------------------------------------------------------------------
+Sat Feb  8 17:58:55 CET 2014 - pth@suse.de
+
+- Remove non-existing patch from spec.
+
+-------------------------------------------------------------------
+Tue Feb  4 13:20:24 CET 2014 - pth@suse.de
+
+- Change license to EPL-1.0. Remove contrib/gprof2dot.awk as it
+  contains a non-working uri.
+
 -------------------------------------------------------------------
 Thu Sep 12 17:56:06 CEST 2013 - pth@suse.de
 
diff --git a/graphviz-gvedit.spec b/graphviz-gvedit.spec
index 1a58d05..d5ab57e 100644
--- a/graphviz-gvedit.spec
+++ b/graphviz-gvedit.spec
@@ -19,18 +19,19 @@
 %define mname graphviz
 
 Name:           graphviz-gvedit
-Version:        2.34.0
+Version:        2.38.0
 Release:        0
 Summary:        Graph editor based on Qt
-License:        IPL-1.0
+License:        EPL-1.0
 Group:          Productivity/Graphics/Visualization/Graph
 Url:            http://www.graphviz.org/
-Source:         http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz
+Source:         http://graphviz.org/pub/graphviz/stable/SOURCES/graphviz-%{version}.tar.gz
 Source2:        graphviz-rpmlintrc
 Patch2:         graphviz-fix-pkgIndex.patch
 #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources
 Patch3:         graphviz-no_strict_aliasing.patch
-Patch4:         graphviz-python3_version.patch
+#PATCH-FIX-UPSTREAM Off-by-one error in htmltable.c
+Patch4:         graphviz-array_overflow.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -66,7 +67,8 @@ package.
 %setup -q -n %{mname}-%{version}
 %patch2
 %patch3
-%patch4 -p1
+%patch4
+rm -f contrib/gprof2dot.awk
 
 # 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
diff --git a/graphviz-plugins-tcl_install_dir.patch b/graphviz-plugins-tcl_install_dir.patch
deleted file mode 100644
index a8d0c3e..0000000
--- a/graphviz-plugins-tcl_install_dir.patch
+++ /dev/null
@@ -1,37 +0,0 @@
----
- tclpkg/Makefile.am |    4 ++--
- tclpkg/Makefile.in |    5 +++--
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-Index: tclpkg/Makefile.am
-===================================================================
---- tclpkg/Makefile.am.orig	2013-09-07 03:07:52.000000000 +0200
-+++ tclpkg/Makefile.am	2013-09-09 13:52:50.830269146 +0200
-@@ -18,9 +18,9 @@ pkgpython26dir = $(pkglibdir)/python26
- pkgpython27dir = $(pkglibdir)/python27
- pkgRdir = $(pkglibdir)/R
- pkgrubydir = $(pkglibdir)/ruby
--pkgtcldir = $(pkglibdir)/tcl
-+pkgtcldir = $(libdir)
- 
--pkgindexdir = $(pkgtcldir)
-+pkgindexdir = $(datadir)/tcl/@PACKAGE@
- if WITH_TCL
- pkgindex_DATA = pkgIndex.tcl
- endif
-Index: tclpkg/Makefile.in
-===================================================================
---- tclpkg/Makefile.in.orig	2013-09-07 03:11:21.000000000 +0200
-+++ tclpkg/Makefile.in	2013-09-09 13:52:50.830269146 +0200
-@@ -522,8 +522,9 @@ pkgpython26dir = $(pkglibdir)/python26
- pkgpython27dir = $(pkglibdir)/python27
- pkgRdir = $(pkglibdir)/R
- pkgrubydir = $(pkglibdir)/ruby
--pkgtcldir = $(pkglibdir)/tcl
--pkgindexdir = $(pkgtcldir)
-+pkgtcldir = $(libdir)
-+pkgindexdir = $(datadir)/tcl/@PACKAGE@
-+
- @WITH_TCL_TRUE@pkgindex_DATA = pkgIndex.tcl
- SUBDIRS = tclstubs tkstubs tclhandle gdtclft tcldot tclpathplan tkspline gv
- EXTRA_DIST = Makefile.old mkpkgindex.sh
diff --git a/graphviz-plugins.changes b/graphviz-plugins.changes
index 6ec79e6..e949309 100644
--- a/graphviz-plugins.changes
+++ b/graphviz-plugins.changes
@@ -1,3 +1,71 @@
+-------------------------------------------------------------------
+Thu Jul 17 23:14:32 CEST 2014 - pth@suse.de
+
+- Change License to EPL-1.0.
+
+-------------------------------------------------------------------
+Tue Jul 15 11:17:42 UTC 2014 - toddrme2178@gmail.com
+
+- Require gd-devel instead of libgd-devel.  That is the current
+  name for the package.
+- Remove upstream-included patch graphviz-ppc64le_lib64_support.patch
+
+-------------------------------------------------------------------
+Wed Jun 18 12:32:34 CEST 2014 - pth@suse.de
+
+- Apply patch from darix to ask ruby for directories.
+- Fix install path for tcl plugins.
+- Fix file list for gnome plugins.
+- Remove graphviz-plugins-tcl_install_dir.patch as it's not needed
+  anymore.
+- Remove graphviz-getaddrinfo.patch as the patch is upstream.
+
+-------------------------------------------------------------------
+Tue Jun 17 12:31:58 UTC 2014 - mrueckert@suse.de
+
+- instead of guessing the ruby paths. let's just use the existing
+  variables or at least ask ruby for it. 
+
+-------------------------------------------------------------------
+Fri May 23 16:46:05 CEST 2014 - pth@suse.de
+
+- Fix URL to point to the new location of the sources.
+
+-------------------------------------------------------------------
+Fri May 23 14:23:57 CEST 2014 - pth@suse.de
+
+- Update to 2.38.0. Changes since 1.35.0:
+   - Resolve bugs: 2409, 2413, 2417, 2420, 2422, 2423, 2425
+   - Enable packing for dot
+   - Allow scaling to work for all non-dot layouts
+   - Add overline text characteristic.
+   - Fix bugs in gvpr and gv.cpp so edges can be created in subgraphs.
+   - Add edgepaint program for coloring edges to make them easier to
+     tell apart.
+   - Modify neato to avoid unnecessary translations of output. This
+     allows positions given on input to remain the same on output.
+   - Fix swig java package to work and support gv.renderresult.
+   - Fix test for the absence of layout (old test relied on statically
+     allocated Agraphinfo_t).
+   - HTML-like tables and cells can now specify which borders should be drawn.
+   - The fixedsize attribute now takes the value "shape" which allows
+     labels much larger than the node shape.
+
+- Remove graphviz-fix-includes.patch as the fix has been done 
+  upstream.
+- Add graphviz-array_overflow.patch to fix an off-by-one error.
+
+-------------------------------------------------------------------
+Sat Feb  8 18:00:04 CET 2014 - pth@suse.de
+
+- Remove non-existing patch from spec.
+
+-------------------------------------------------------------------
+Tue Feb  4 13:20:28 CET 2014 - pth@suse.de
+
+- Change license to EPL-1.0. Remove contrib/gprof2dot.awk as it
+  contains a non-working uri.
+
 -------------------------------------------------------------------
 Sat Feb  1 15:42:04 UTC 2014 - coolo@suse.com
 
diff --git a/graphviz-plugins.spec b/graphviz-plugins.spec
index 46df282..32f1804 100644
--- a/graphviz-plugins.spec
+++ b/graphviz-plugins.spec
@@ -64,6 +64,7 @@ BuildRequires:  ocaml
 BuildRequires:  perl
 BuildRequires:  php5-devel
 BuildRequires:  python-devel
+BuildRequires:  ruby
 BuildRequires:  ruby-devel
 BuildRequires:  swig
 BuildRequires:  tk-devel >= 8.3
@@ -85,31 +86,27 @@ BuildRequires:  pkgconfig(pango)
 %if 0%{?suse_version} > 1020
 BuildRequires:  fdupes
 %endif
-Version:        2.34.0
+Version:        2.38.0
 Release:        0
 Summary:        Graph Visualization Tools
-License:        IPL-1.0
+License:        EPL-1.0
 Group:          Productivity/Graphics/Visualization/Graph
 Url:            http://www.graphviz.org/
-Source:         http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz
+Source:         http://graphviz.org/pub/graphviz/stable/SOURCES/graphviz-%{version}.tar.gz
 #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources
 Patch3:         graphviz-no_strict_aliasing.patch
-#PATCH-FIX-UPSTREAM print can only be called as function in python3
-Patch4:         graphviz-python3_version.patch
+Patch4:         graphviz-array_overflow.patch
 #Patches from 100 up are for graphviz-plugin only
 Patch100:       graphviz-plugins-fix_install_dirs.patch
-Patch102:       graphviz-plugins-tcl_install_dir.patch
 Patch103:       graphviz-2.20.2-interpreter_names.patch
 Patch106:       graphviz-fix-pkgIndex.patch
 #PATCH-FIX-UPSTREAM Don't warn about harmless issues with swig generated code
 Patch108:       graphviz-useless_warnings.patch
-Patch109:       graphviz-ppc64le_lib64_support.patch
 Requires(pre):  coreutils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-%define rb_libdir    %{_libdir}/ruby
-%define rb_sitedir   %{rb_libdir}/site_ruby/%{rb_ver}
-%define rb_vendordir %{rb_libdir}/vendor_ruby/%{rb_ver}
+%{!?rb_vendorarchdir: %global rb_vendorarchdir %(/usr/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]' )}
+%{!?rb_sitearchdir:   %global rb_sitearchdir   %(/usr/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitearchdir"]' )}
 %define lua_libdir %{_libdir}/lua/%(pkg-config --variable=V lua)
 %define debug_package_requires graphviz_plugin = %{version}-%{release}
 
@@ -269,13 +266,12 @@ Provides some additional PDF and HTML documentation for graphviz.
 %prep
 %setup -q -n %{mname}-%{version}
 %patch3
-%patch4 -p1
+%patch4
 %patch100
-%patch102
 %patch103
 %patch106
 %patch108
-%patch109
+rm -f contrib/gprof2dot.awk
 
 # 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
@@ -311,7 +307,7 @@ export CPPFLAGS="%{optflags}"
 make DESTDIR=%{buildroot}  %{?_smp_mflags}
 
 %install
-%makeinstall \
+make install DESTDIR=%{buildroot} \
 	docdir=%{buildroot}%{_docdir}/%{mname} \
 	pkgconfigdir=%{_libdir}/pkgconfig
 find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
@@ -351,6 +347,8 @@ done
 %fdupes -s %{buildroot}%{_defaultdocdir}/%{mname}
 %endif
 rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib}
+install -Dd %{buildroot}%{rb_vendorarchdir}
+mv %{buildroot}%{_libdir}/%{mname}/tcl/pkgIndex.tcl %{buildroot}%{_datadir}/tcl/%{mname}/pkgIndex.tcl
 
 %files -n graphviz-gd
 %defattr(-,root,root)
@@ -371,9 +369,9 @@ rm -rf %{buildroot}/%{_libdir}/%{mname}/%{_lib}
 %files -n graphviz-gnome
 %defattr(-,root,root,-)
 %{_libdir}/graphviz/libgvplugin_pango*
-%{_libdir}/graphviz/libgvplugin_gdk_pixbuf*
 %{_libdir}/graphviz/libgvplugin_gtk*
 %{_libdir}/graphviz/libgvplugin_xlib*
+%{_libdir}/graphviz/libgvplugin_gdk*
 
 %post -n graphviz-tcl -p /sbin/ldconfig
 
diff --git a/graphviz-ppc64le_lib64_support.patch b/graphviz-ppc64le_lib64_support.patch
deleted file mode 100644
index 93d4dc0..0000000
--- a/graphviz-ppc64le_lib64_support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -102,7 +102,7 @@ if test -z "$LIBPOSTFIX"; then
-   case "${host_os}" in
-     *linux* )
-       case "${host_cpu}" in
--        aarch64 | powerpc64 | s390x | x86_64 | sparc64 )
-+        aarch64 | powerpc64 | powerpc64le | s390x | x86_64 | sparc64 )
-           LIBPOSTFIX="64"
-           ;;
-       esac
diff --git a/graphviz-python3_version.patch b/graphviz-python3_version.patch
deleted file mode 100644
index d398459..0000000
--- a/graphviz-python3_version.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Bracketing sys.version_info is wrong and print is only a function im python 3.
-
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: graphviz-2.34.0/configure.ac
-===================================================================
---- graphviz-2.34.0.orig/configure.ac	2013-09-07 03:07:52.000000000 +0200
-+++ graphviz-2.34.0/configure.ac	2013-09-12 16:25:48.006562980 +0200
-@@ -1143,7 +1143,7 @@ else
-       if test "x$PYTHON" = "x"; then
-         use_python="No (python not available)"
-       else
--        PYTHON_VERSION=`$PYTHON -c "import sys; print '%d.%d' % (sys.version_info[[0:2]])"`
-+        PYTHON_VERSION=`$PYTHON -c "import sys; print('%d.%d' % sys.version_info[[0:2]])"`
-         if test "x$PYTHON_VERSION" = "x"; then
-           PYTHON=
-         else
diff --git a/graphviz-smyrna.changes b/graphviz-smyrna.changes
index ab3eca1..0377b19 100644
--- a/graphviz-smyrna.changes
+++ b/graphviz-smyrna.changes
@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Thu Jul 17 23:14:32 CEST 2014 - pth@suse.de
+
+- Change License to EPL-1.0.
+
+-------------------------------------------------------------------
+Fri May 23 16:46:05 CEST 2014 - pth@suse.de
+
+- Fix URL to point to the new location of the sources.
+
+-------------------------------------------------------------------
+Fri May 23 14:23:57 CEST 2014 - pth@suse.de
+
+- Update to 2.38.0. Changes since 1.35.0:
+   - Resolve bugs: 2409, 2413, 2417, 2420, 2422, 2423, 2425
+   - Enable packing for dot
+   - Allow scaling to work for all non-dot layouts
+   - Add overline text characteristic.
+   - Fix bugs in gvpr and gv.cpp so edges can be created in subgraphs.
+   - Add edgepaint program for coloring edges to make them easier to
+     tell apart.
+   - Modify neato to avoid unnecessary translations of output. This
+     allows positions given on input to remain the same on output.
+   - Fix swig java package to work and support gv.renderresult.
+   - Fix test for the absence of layout (old test relied on statically
+     allocated Agraphinfo_t).
+   - HTML-like tables and cells can now specify which borders should be drawn.
+   - The fixedsize attribute now takes the value "shape" which allows
+     labels much larger than the node shape.
+
+- Remove graphviz-fix-includes.patch as the fix has been done 
+  upstream.
+- Add graphviz-array_overflow.patch to fix an off-by-one error.
+
+-------------------------------------------------------------------
+Tue Feb  4 13:20:33 CET 2014 - pth@suse.de
+
+- Update to 2.36,0.
+- Change license to EPL-1.0. Remove contrib/gprof2dot.awk as it
+  contains a non-working uri.
+
 -------------------------------------------------------------------
 Thu Jan  2 02:21:22 UTC 2014 - mrdocs@opensuse.org
 
diff --git a/graphviz-smyrna.spec b/graphviz-smyrna.spec
index 8e53403..b9cd3c7 100644
--- a/graphviz-smyrna.spec
+++ b/graphviz-smyrna.spec
@@ -19,18 +19,18 @@
 %define mname graphviz
 
 Name:           graphviz-smyrna
-Version:        2.34.0
+Version:        2.38.0
 Release:        0
 Summary:        Glut based graph viewer
-License:        IPL-1.0
+License:        EPL-1.0
 Group:          Productivity/Graphics/Visualization/Graph
 Url:            http://www.graphviz.org/
-Source:         http://www.graphviz.org/pub/graphviz/ARCHIVE/%{mname}-%{version}.tar.gz
+Source:         http://graphviz.org/pub/graphviz/stable/SOURCES/graphviz-%{version}.tar.gz
 Source2:        graphviz-rpmlintrc
 Patch2:         graphviz-fix-pkgIndex.patch
 #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources
 Patch3:         graphviz-no_strict_aliasing.patch
-Patch4:         graphviz-python3_version.patch
+Patch4:         graphviz-array_overflow.patch
 #PATCH-FIX-UPSTREAM add flags to also link against libGLU and libGL
 Patch10:        graphviz-smyrna-link_against_glu.patch
 BuildRequires:  autoconf
@@ -78,8 +78,9 @@ package.
 %setup -q -n %{mname}-%{version}
 %patch2
 %patch3
-%patch4 -p1
 %patch10
+%patch4
+rm -f contrib/gprof2dot.awk
 
 # 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
diff --git a/graphviz.changes b/graphviz.changes
index a009cf8..7446cb1 100644
--- a/graphviz.changes
+++ b/graphviz.changes
@@ -1,3 +1,76 @@
+-------------------------------------------------------------------
+Tue Jul 15 11:33:27 UTC 2014 - toddrme2178@gmail.com
+
+- Remove upstream-included patch graphviz-ppc64le_lib64_support.patch
+  from graphviz-plugins.spec
+
+-------------------------------------------------------------------
+Fri May 23 16:46:05 CEST 2014 - pth@suse.de
+
+- Fix URL to point to the new location of the sources.
+
+-------------------------------------------------------------------
+Fri May 23 14:23:57 CEST 2014 - pth@suse.de
+
+- Update to 2.38.0. Changes since 2.36.0:
+   - Resolve bugs: 2409, 2413, 2417, 2420, 2422, 2423, 2425
+   - Enable packing for dot
+   - Allow scaling to work for all non-dot layouts
+   - Add overline text characteristic.
+   - Fix bugs in gvpr and gv.cpp so edges can be created in subgraphs.
+   - Add edgepaint program for coloring edges to make them easier to
+     tell apart.
+   - Modify neato to avoid unnecessary translations of output. This
+     allows positions given on input to remain the same on output.
+   - Fix swig java package to work and support gv.renderresult.
+   - Fix test for the absence of layout (old test relied on statically
+     allocated Agraphinfo_t).
+   - HTML-like tables and cells can now specify which borders should be drawn.
+   - The fixedsize attribute now takes the value "shape" which allows
+     labels much larger than the node shape.
+
+- Remove graphviz-fix-includes.patch as the fix has been done 
+  upstream.
+- Add graphviz-array_overflow.patch to fix an off-by-one error.
+
+-------------------------------------------------------------------
+Tue Feb  4 15:52:00 CET 2014 - pth@suse.de
+
+- Update to 2.36,0:
+  (graphviz tracker lives at http://www.graphviz.org/mantisbt/my_view_page.php)
+
+  Fixed bugs:
+  * The xdot pad attribute is documented to have a default value of
+    0.0555 (inches, equals 0002091:0000004 points).  However when no
+    pad attribute was specified, xdot output behaved as though the
+    default was 0 (graphviz tracker 2372).
+  * Graphviz gave incorrect svg when labels contained HTML entities
+    (graphviz tracker 2384).
+  * Building gvedit failed with undefined references (graphviz
+    tracker 2388).
+  * Document that edge[style=tapered] does not support colorList and
+    that edge[style=tapered] does not work with arrowType:none
+    (graphviz tracker 2391).
+  * Use a stronger test for orthogonal routing and, if it fails, revert
+    to line segments for edges (graphviz tracker 2393).
+  * Fix xdot background polygon coordinates being "nan" with no nodes
+    (graphviz tracker 2393).
+  * Circo couldn't rescale a graph using the mindist attribute
+    (graphviz tracker 2395).
+  - Remove old libgraph sources from distributions.
+  - Move master git repo to github.com
+
+  September 15, 2013
+  - Add <S> element for strike-through to HTML-like labels.
+
+  - This version also fixes the security bugs reported in january.
+
+-------------------------------------------------------------------
+Tue Feb  4 13:19:20 CET 2014 - pth@suse.de
+
+- Change license to EPL-1.0. Remove contrib/gprof2dot.awk as it
+  contains a non-working uri.
+
 -------------------------------------------------------------------
 Wed Dec 11 16:17:50 UTC 2013 - matz@suse.de
 
diff --git a/graphviz.spec b/graphviz.spec
index a5d5e8a..ab471e2 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -20,26 +20,19 @@
 %define config_file config6
 
 Name:           graphviz
-Version:        2.34.0
+Version:        2.38.0
 Release:        0
 Summary:        Graph Visualization Tools
-License:        IPL-1.0
+License:        EPL-1.0
 Group:          Applications/Productivity
 Url:            http://www.graphviz.org/
-Source:         http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
+Source:         http://graphviz.org/pub/graphviz/stable/SOURCES/graphviz-%{version}.tar.gz
 Source2:        graphviz-rpmlintrc
 Patch2:         graphviz-fix-pkgIndex.patch
 #PATCH-FIX-UPSTREAM There are too many type-punnings in the vmalloc sources
 Patch3:         graphviz-no_strict_aliasing.patch
-#PATCH-FIX-UPSTREAM print can only be called as function in python3
-Patch4:         graphviz-python3_version.patch
-#PATCH-FIX-UPSTREAM Use getaddrinfo instead of gethostbyname
-#                   This got accepted upstream so it can be removed on the next
-#                   release.
-Patch5:         graphviz-getaddrinfo.patch
-#PATCH-FIX-UPSTREAM This is fixed upstream in a similar way, can be
-#                   removed update to next release
-Patch6:         graphviz-fix-includes.patch
+#PATCH-FIX-UPSTREAM Off-by-one bug
+Patch4:         graphviz-array_overflow.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
@@ -98,9 +91,9 @@ Note: If you need output in png format you also need to install
 %setup -q
 %patch2
 %patch3
-%patch4 -p1
-%patch5
-%patch6
+%patch4
+
+rm -f contrib/gprof2dot.awk
 
 # 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
@@ -185,7 +178,6 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 %files
 %defattr(-,root,root)
 %doc doc/FAQ.html AUTHORS COPYING README NEWS ChangeLog
-#%%attr(755,root,root) %{_bindir}/*
 %{_bindir}/acyclic
 %{_bindir}/bcomps
 %{_bindir}/ccomps
@@ -196,6 +188,7 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 %{_bindir}/dot2gxl
 %{_bindir}/dot_builtins
 %{_bindir}/dotty
+%{_bindir}/edgepaint
 %{_bindir}/fdp   
 %{_bindir}/gc  
 %{_bindir}/gml2gv
@@ -257,6 +250,8 @@ if ! test -x $RPM_INSTALL_PREFIX0/bin/dot; then rm -f $RPM_INSTALL_PREFIX0/%{_li
 %{_datadir}/%{name}/gvpr/span
 %{_datadir}/%{name}/gvpr/topon
 %{_datadir}/%{name}/gvpr/treetoclust
+%{_datadir}/%{name}/gvpr/chkclusters
+%{_datadir}/%{name}/gvpr/cycle
 
 %doc %{_mandir}/man1/*.1*
 %doc %{_mandir}/man7/*.7*