diff --git a/_service b/_service
index 8a4ece4..3430c8e 100644
--- a/_service
+++ b/_service
@@ -6,7 +6,7 @@
master
disable
graphviz
- 2.40.1+git%cd.%h
+ 2.42.3
*.tar
diff --git a/graphviz-2.42.1.tar.gz b/graphviz-2.42.1.tar.gz
deleted file mode 100644
index cf722e3..0000000
--- a/graphviz-2.42.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e7c5066a78524853b027301834bf3f65871354930939bf11b66e4049d0fc5bf
-size 25543401
diff --git a/graphviz-2.42.3.tar.gz b/graphviz-2.42.3.tar.gz
new file mode 100644
index 0000000..68aed87
--- /dev/null
+++ b/graphviz-2.42.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8faf3fc25317b1d15166205bf64c1b4aed55a8a6959dcabaa64dbad197e47add
+size 26246717
diff --git a/graphviz-addons.changes b/graphviz-addons.changes
index 2e52b8b..172edc6 100644
--- a/graphviz-addons.changes
+++ b/graphviz-addons.changes
@@ -1,8 +1,23 @@
+-------------------------------------------------------------------
+Mon Jan 13 11:59:55 UTC 2020 - Christian Vögl
+
+- Update to new release 2.42.3
+ - tidy gvedit about dialog strings
+ - check for mmap failure in plugin code
+ - fix broken symlinks to _gv.so with Python
+ - fix out of source build with LIBGD
+ - some minor bugfixes
+- Fix changelog of last update:
+ - Accidentally had both CVE entries mashed together.
+
+
+
-------------------------------------------------------------------
Wed Sep 4 11:56:02 UTC 2019 - Christian Vögl
- Switch from github master to new release 2.42.1
- - Fixes CVE-2018-10196 (bsc#1132091)
+ - Fixes CVE-2019-11023 (bsc#1132091)
+ - Fixes CVE-2018-10196 (bsc#1093447)
- Fixes quite a few bugs
- Removed graphviz-fix-ruby-version.patch (fixed in upstream)
diff --git a/graphviz-addons.spec b/graphviz-addons.spec
index 55b177d..31d5d8b 100644
--- a/graphviz-addons.spec
+++ b/graphviz-addons.spec
@@ -1,7 +1,7 @@
#
# spec file for package graphviz-addons
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,11 +35,7 @@
%define php_version 5
%endif
-%if 0%{?suse_version} > 1510
-%define ruby_version 2.6
-%else
-%define ruby_version 2.5
-%endif
+%define ruby_version $(pkg-config --variable=RUBY_API_VERSION %{_libdir}/pkgconfig/ruby-*.pc)
# No pkgconfig(gts) in sle12 GA or SPx, but in sle15
%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
@@ -48,7 +44,7 @@
%define sle12 0
%endif
Name: graphviz-addons
-Version: 2.42.1
+Version: 2.42.3
Release: 0
Summary: Graph Visualization Tools
License: EPL-1.0
diff --git a/graphviz.changes b/graphviz.changes
index 2e52b8b..5b7c64d 100644
--- a/graphviz.changes
+++ b/graphviz.changes
@@ -1,8 +1,28 @@
+-------------------------------------------------------------------
+Thu Mar 5 12:03:06 UTC 2020 - Dominique Leuenberger
+
+- Auto-identify the correct ruby-version using pkg-config.
+
+-------------------------------------------------------------------
+Mon Jan 13 11:59:55 UTC 2020 - Christian Vögl
+
+- Update to new release 2.42.3
+ - tidy gvedit about dialog strings
+ - check for mmap failure in plugin code
+ - fix broken symlinks to _gv.so with Python
+ - fix out of source build with LIBGD
+ - some minor bugfixes
+- Fix changelog of last update:
+ - Accidentally had both CVE entries mashed together.
+
+
+
-------------------------------------------------------------------
Wed Sep 4 11:56:02 UTC 2019 - Christian Vögl
- Switch from github master to new release 2.42.1
- - Fixes CVE-2018-10196 (bsc#1132091)
+ - Fixes CVE-2019-11023 (bsc#1132091)
+ - Fixes CVE-2018-10196 (bsc#1093447)
- Fixes quite a few bugs
- Removed graphviz-fix-ruby-version.patch (fixed in upstream)
diff --git a/graphviz.spec b/graphviz.spec
index 971ac0f..3a820cb 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -1,7 +1,7 @@
#
# spec file for package graphviz
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,11 +35,7 @@
%define php_version 5
%endif
-%if 0%{?suse_version} > 1510
-%define ruby_version 2.6
-%else
-%define ruby_version 2.5
-%endif
+%define ruby_version $(pkg-config --variable=RUBY_API_VERSION %{_libdir}/pkgconfig/ruby-*.pc)
# No pkgconfig(gts) in sle12 GA or SPx, but in sle15
%if 0%{?suse_version} == 1315 && !0%{?is_opensuse}
@@ -48,7 +44,7 @@
%define sle12 0
%endif
Name: graphviz
-Version: 2.42.1
+Version: 2.42.3
Release: 0
Summary: Graph Visualization Tools
License: EPL-1.0