From 8c7e27288ed500e2c9f78ad2ab303d2a2385414d7f626ac1727c873e14c65212 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Thu, 29 Nov 2018 12:23:29 +0000 Subject: [PATCH 1/2] Accepting request 652600 from home:jbrielmaier:branches:graphics - Support dynamic move to Guile 2.2, part of boo#1117121: - Replace conditional pkgconfig(guile-2.[02]) BuildRequires with guile-devel: The package name is unchanged, which allows the distro projects to move wihout step-locking changes. - Patch configure.ac to look for guile-2.2 if guile 2.2 is being used. - order inputs alphabetically replaces https://build.opensuse.org/request/show/652442 OBS-URL: https://build.opensuse.org/request/show/652600 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=134 --- graphviz-addons.changes | 11 +++++++++++ graphviz-addons.spec | 19 +++++++------------ graphviz.changes | 11 +++++++++++ graphviz.spec | 19 +++++++------------ 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/graphviz-addons.changes b/graphviz-addons.changes index fbe5a32..6984f65 100644 --- a/graphviz-addons.changes +++ b/graphviz-addons.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Nov 29 10:21:10 UTC 2018 - jbrielmaier@suse.de + +- Support dynamic move to Guile 2.2, part of boo#1117121: + - Replace conditional pkgconfig(guile-2.[02]) BuildRequires with + guile-devel: The package name is unchanged, which allows the + distro projects to move wihout step-locking changes. + - Patch configure.ac to look for guile-2.2 if guile 2.2 is being + used. +- order inputs alphabetically + ------------------------------------------------------------------- Fri Nov 16 15:21:38 UTC 2018 - trenn@suse.de diff --git a/graphviz-addons.spec b/graphviz-addons.spec index 3160e3a..16452e4 100644 --- a/graphviz-addons.spec +++ b/graphviz-addons.spec @@ -66,6 +66,7 @@ BuildRequires: bison BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ +BuildRequires: guile-devel BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: pkgconfig @@ -100,23 +101,17 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gtkglext-1.0) BuildRequires: pkgconfig(ice) -BuildRequires: pkgconfig(sm) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xaw7) -BuildRequires: pkgconfig(xext) -# Disabled until guile 2.2 lands -%if 0 && 0%{?suse_version} >= 1500 -BuildRequires: pkgconfig(guile-2.2) -%else -BuildRequires: pkgconfig(guile-2.0) -%endif BuildRequires: pkgconfig(ijs) BuildRequires: pkgconfig(libglade-2.0) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(python) +BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(tcl) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xext) %if %{with java} BuildRequires: java-devel >= 1.6.0 %endif @@ -314,9 +309,9 @@ programs that use the graphviz libraries including man3 pages. %patch6 %patch7 %patch8 -%if 0 && 0%{?suse_version} >= 1500 +if pkgconfig --version-atleast=2.2 guile-2.2; then sed "s/guile-2.0/guile-2.2/" -i configure.ac -%endif +fi rm -f contrib/gprof2dot.awk diff --git a/graphviz.changes b/graphviz.changes index fbe5a32..6984f65 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Nov 29 10:21:10 UTC 2018 - jbrielmaier@suse.de + +- Support dynamic move to Guile 2.2, part of boo#1117121: + - Replace conditional pkgconfig(guile-2.[02]) BuildRequires with + guile-devel: The package name is unchanged, which allows the + distro projects to move wihout step-locking changes. + - Patch configure.ac to look for guile-2.2 if guile 2.2 is being + used. +- order inputs alphabetically + ------------------------------------------------------------------- Fri Nov 16 15:21:38 UTC 2018 - trenn@suse.de diff --git a/graphviz.spec b/graphviz.spec index d5b60f3..bd8b28e 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -66,6 +66,7 @@ BuildRequires: bison BuildRequires: fdupes BuildRequires: flex BuildRequires: gcc-c++ +BuildRequires: guile-devel BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: pkgconfig @@ -100,23 +101,17 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gtkglext-1.0) BuildRequires: pkgconfig(ice) -BuildRequires: pkgconfig(sm) -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xaw7) -BuildRequires: pkgconfig(xext) -# Disabled until guile 2.2 lands -%if 0 && 0%{?suse_version} >= 1500 -BuildRequires: pkgconfig(guile-2.2) -%else -BuildRequires: pkgconfig(guile-2.0) -%endif BuildRequires: pkgconfig(ijs) BuildRequires: pkgconfig(libglade-2.0) BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(python) +BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(tcl) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xaw7) +BuildRequires: pkgconfig(xext) %if %{with java} BuildRequires: java-devel >= 1.6.0 %endif @@ -314,9 +309,9 @@ programs that use the graphviz libraries including man3 pages. %patch6 %patch7 %patch8 -%if 0 && 0%{?suse_version} >= 1500 +if pkgconfig --version-atleast=2.2 guile-2.2; then sed "s/guile-2.0/guile-2.2/" -i configure.ac -%endif +fi rm -f contrib/gprof2dot.awk From 81810552a71ae305bde373e239fa612d37612568624bc219223fbe8a93c92af7 Mon Sep 17 00:00:00 2001 From: Thomas Renninger Date: Fri, 30 Nov 2018 10:23:39 +0000 Subject: [PATCH 2/2] Accepting request 652812 from home:jbrielmaier:branches:graphics - use pkg-config with correct parameter, reported by Werner Fink Part of boo#1117121 OBS-URL: https://build.opensuse.org/request/show/652812 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=135 --- graphviz-addons.changes | 5 +++++ graphviz-addons.spec | 3 ++- graphviz.changes | 5 +++++ graphviz.spec | 3 ++- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/graphviz-addons.changes b/graphviz-addons.changes index 6984f65..1ba05b9 100644 --- a/graphviz-addons.changes +++ b/graphviz-addons.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 30 07:34:24 UTC 2018 - jbrielmaier@suse.de + +- use pkg-config with correct parameter, reported by Werner Fink + ------------------------------------------------------------------- Thu Nov 29 10:21:10 UTC 2018 - jbrielmaier@suse.de diff --git a/graphviz-addons.spec b/graphviz-addons.spec index 16452e4..d65717d 100644 --- a/graphviz-addons.spec +++ b/graphviz-addons.spec @@ -309,7 +309,8 @@ programs that use the graphviz libraries including man3 pages. %patch6 %patch7 %patch8 -if pkgconfig --version-atleast=2.2 guile-2.2; then +# pkg-config returns 0 (TRUE) when guile-2.2 is present +if pkg-config --atleast-version=2.2 guile-2.2; then sed "s/guile-2.0/guile-2.2/" -i configure.ac fi diff --git a/graphviz.changes b/graphviz.changes index 6984f65..1ba05b9 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 30 07:34:24 UTC 2018 - jbrielmaier@suse.de + +- use pkg-config with correct parameter, reported by Werner Fink + ------------------------------------------------------------------- Thu Nov 29 10:21:10 UTC 2018 - jbrielmaier@suse.de diff --git a/graphviz.spec b/graphviz.spec index bd8b28e..e46563c 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -309,7 +309,8 @@ programs that use the graphviz libraries including man3 pages. %patch6 %patch7 %patch8 -if pkgconfig --version-atleast=2.2 guile-2.2; then +# pkg-config returns 0 (TRUE) when guile-2.2 is present +if pkg-config --atleast-version=2.2 guile-2.2; then sed "s/guile-2.0/guile-2.2/" -i configure.ac fi