diff --git a/graphviz-addons.changes b/graphviz-addons.changes index 2848a60..3e70099 100644 --- a/graphviz-addons.changes +++ b/graphviz-addons.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 25 14:52:00 UTC 2018 - trenn@suse.de + +- Build with gts support (bsc#1108978, bsc#1108976) + SLE12 flavors do not provide gts, so explicitly exclude + gts support there. + ------------------------------------------------------------------- Mon Jul 30 11:24:20 UTC 2018 - bwiedemann@suse.com diff --git a/graphviz-addons.spec b/graphviz-addons.spec index 49b6267..6b640c5 100644 --- a/graphviz-addons.spec +++ b/graphviz-addons.spec @@ -32,6 +32,12 @@ %else %define php_version 5 %endif +# No pkgconfig(gts) in sle12 GA or SPx, but in sle15 +%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} +%define sle12 1 +%else +%define sle12 0 +%endif Name: graphviz-addons Version: 2.40.1 Release: 0 @@ -64,6 +70,9 @@ BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(expat) +%if 0%{sle12} != 1 +BuildRequires: pkgconfig(gts) +%endif BuildRequires: pkgconfig(zlib) Requires: graphviz-plugins-core = %{version} Recommends: graphviz-gd = %{version} @@ -90,7 +99,6 @@ BuildRequires: pkgconfig(gdlib) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gtkglext-1.0) -BuildRequires: pkgconfig(gts) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(x11) diff --git a/graphviz.changes b/graphviz.changes index 2848a60..3e70099 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 25 14:52:00 UTC 2018 - trenn@suse.de + +- Build with gts support (bsc#1108978, bsc#1108976) + SLE12 flavors do not provide gts, so explicitly exclude + gts support there. + ------------------------------------------------------------------- Mon Jul 30 11:24:20 UTC 2018 - bwiedemann@suse.com diff --git a/graphviz.spec b/graphviz.spec index c537ee2..74c7452 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -32,6 +32,12 @@ %else %define php_version 5 %endif +# No pkgconfig(gts) in sle12 GA or SPx, but in sle15 +%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} +%define sle12 1 +%else +%define sle12 0 +%endif Name: graphviz Version: 2.40.1 Release: 0 @@ -64,6 +70,9 @@ BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: pkgconfig(expat) +%if 0%{sle12} != 1 +BuildRequires: pkgconfig(gts) +%endif BuildRequires: pkgconfig(zlib) Requires: graphviz-plugins-core = %{version} Recommends: graphviz-gd = %{version} @@ -90,7 +99,6 @@ BuildRequires: pkgconfig(gdlib) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gtkglext-1.0) -BuildRequires: pkgconfig(gts) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(x11) diff --git a/pre_checkin.sh b/pre_checkin.sh index d20c455..9eb5b10 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -3,4 +3,5 @@ cp graphviz.changes graphviz-addons.changes sed \ -e 's:%bcond_with extras:%bcond_without extras:' \ -e 's#Name: graphviz#Name: graphviz-addons#' \ + -e 's#spec file for package graphviz#spec file for package graphviz-addons#' \ graphviz.spec > graphviz-addons.spec