Accepting request 644836 from home:trenn:branches:graphics

- Build with gts support (bsc#1108978, bsc#1108976)
  SLE12 flavors do not provide gts, so explicitly exclude
  gts support there.

- Build with gts support (bsc#1108978, bsc#1108976)
  SLE12 flavors do not provide gts, so explicitly exclude
  gts support there.

OBS-URL: https://build.opensuse.org/request/show/644836
OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=131
This commit is contained in:
Thomas Renninger 2018-11-02 11:47:29 +00:00 committed by Git OBS Bridge
parent 0d7be93ce7
commit 103f8d9230
5 changed files with 33 additions and 2 deletions

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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)

View File

@ -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