From e999350bf48d62daff54845b41f846e177d48e346b5f1cc78f97c04c4f407777 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Mon, 14 Aug 2017 13:05:00 +0000 Subject: [PATCH] Accepting request 514955 from home:scarabeus_iv:branches:graphics - Add bcond for java and ocaml that can be overriden in staging prj - Add bcond for java and ocaml that can be overriden in staging prj OBS-URL: https://build.opensuse.org/request/show/514955 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=115 --- graphviz-addons.changes | 5 +++++ graphviz-addons.spec | 15 +++++++++++++-- graphviz.changes | 5 +++++ graphviz.spec | 15 +++++++++++++-- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/graphviz-addons.changes b/graphviz-addons.changes index 77ebd84..f8cd90d 100644 --- a/graphviz-addons.changes +++ b/graphviz-addons.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 7 11:45:08 UTC 2017 - tchvatal@suse.com + +- Add bcond for java and ocaml that can be overriden in staging prj + ------------------------------------------------------------------- Thu Aug 3 12:56:24 UTC 2017 - tchvatal@suse.com diff --git a/graphviz-addons.spec b/graphviz-addons.spec index 4ba93e5..4f35a77 100644 --- a/graphviz-addons.spec +++ b/graphviz-addons.spec @@ -23,6 +23,9 @@ # Build with extras or not, determines pulling additional dependencies # and breaks build cycle %bcond_without extras +# Java and ocaml are not in ring1, thus this gets overriden in staging +%bcond_without java +%bcond_without ocaml Name: graphviz-addons Version: 2.40.1 Release: 0 @@ -73,8 +76,6 @@ Recommends: graphviz-gd = %{version} Recommends: graphviz-gnome = %{version} %if %{with extras} BuildRequires: freeglut-devel -BuildRequires: java-devel >= 1.6.0 -BuildRequires: ocaml BuildRequires: perl BuildRequires: php7-devel BuildRequires: ruby-devel @@ -96,6 +97,12 @@ BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(tcl) +%if %{with java} +BuildRequires: java-devel >= 1.6.0 +%endif +%if %{with ocaml} +BuildRequires: ocaml +%endif %endif %description @@ -474,17 +481,21 @@ fi %{_libdir}/graphviz/guile %{_mandir}/man3/gv.3guile%{ext_man} +%if %{with java} %files -n graphviz-java %{_libdir}/graphviz/java %{_mandir}/man3/gv.3java%{ext_man} +%endif %files -n graphviz-lua %{lua_archdir}/gv.so %{_mandir}/man3/gv.3lua%{ext_man} +%if %{with ocaml} %files -n graphviz-ocaml %{_libdir}/graphviz/ocaml %{_mandir}/man3/gv.3ocaml%{ext_man} +%endif %files -n graphviz-perl %{perl_vendorarch}/gv.pm diff --git a/graphviz.changes b/graphviz.changes index 77ebd84..f8cd90d 100644 --- a/graphviz.changes +++ b/graphviz.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 7 11:45:08 UTC 2017 - tchvatal@suse.com + +- Add bcond for java and ocaml that can be overriden in staging prj + ------------------------------------------------------------------- Thu Aug 3 12:56:24 UTC 2017 - tchvatal@suse.com diff --git a/graphviz.spec b/graphviz.spec index 437bf65..c42bc94 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -23,6 +23,9 @@ # Build with extras or not, determines pulling additional dependencies # and breaks build cycle %bcond_with extras +# Java and ocaml are not in ring1, thus this gets overriden in staging +%bcond_without java +%bcond_without ocaml Name: graphviz Version: 2.40.1 Release: 0 @@ -73,8 +76,6 @@ Recommends: graphviz-gd = %{version} Recommends: graphviz-gnome = %{version} %if %{with extras} BuildRequires: freeglut-devel -BuildRequires: java-devel >= 1.6.0 -BuildRequires: ocaml BuildRequires: perl BuildRequires: php7-devel BuildRequires: ruby-devel @@ -96,6 +97,12 @@ BuildRequires: pkgconfig(lua) BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(python) BuildRequires: pkgconfig(tcl) +%if %{with java} +BuildRequires: java-devel >= 1.6.0 +%endif +%if %{with ocaml} +BuildRequires: ocaml +%endif %endif %description @@ -474,17 +481,21 @@ fi %{_libdir}/graphviz/guile %{_mandir}/man3/gv.3guile%{ext_man} +%if %{with java} %files -n graphviz-java %{_libdir}/graphviz/java %{_mandir}/man3/gv.3java%{ext_man} +%endif %files -n graphviz-lua %{lua_archdir}/gv.so %{_mandir}/man3/gv.3lua%{ext_man} +%if %{with ocaml} %files -n graphviz-ocaml %{_libdir}/graphviz/ocaml %{_mandir}/man3/gv.3ocaml%{ext_man} +%endif %files -n graphviz-perl %{perl_vendorarch}/gv.pm