From b9458a5274f0e4d0cf0316e5db4f1f0b8c604dcf4a3b6581b7aa5373a67543e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20V=C3=B6gl?= Date: Mon, 9 Mar 2020 10:40:44 +0000 Subject: [PATCH] Accepting request 782020 from home:dimstar:Factory OBS-URL: https://build.opensuse.org/request/show/782020 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=146 --- graphviz-2.42.1.tar.gz | 3 --- graphviz-addons.spec | 6 +----- graphviz.changes | 5 +++++ graphviz.spec | 6 +----- 4 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 graphviz-2.42.1.tar.gz 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-addons.spec b/graphviz-addons.spec index c7ca84c..31d5d8b 100644 --- a/graphviz-addons.spec +++ b/graphviz-addons.spec @@ -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} diff --git a/graphviz.changes b/graphviz.changes index 172edc6..5b7c64d 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/graphviz.spec b/graphviz.spec index 8e2fbd5..3a820cb 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -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}