SHA256
1
0
forked from pool/graphviz

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
This commit is contained in:
Dirk Stoecker 2017-08-14 13:05:00 +00:00 committed by Git OBS Bridge
parent 48044543ea
commit e999350bf4
4 changed files with 36 additions and 4 deletions

View File

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

View File

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

View File

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

View File

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