From: John Ellson Date: Thu, 20 Jul 2017 15:57:16 +0000 (-0400) Subject: disable ocaml, sharp, lasi on rhel - missing deps X-Git-Tag: 2.42.0~151 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1cfc310ca0c45a8e2b63c8168ca8bafb351fa48;p=graphviz disable ocaml, sharp, lasi on rhel - missing deps --- diff --git a/graphviz.spec.in b/graphviz.spec.in index 408a68c8c..66a971cc1 100644 --- a/graphviz.spec.in +++ b/graphviz.spec.in @@ -63,21 +63,28 @@ BuildRequires: poppler-glib-devel BuildRequires: qt-devel BuildRequires: gts-devel BuildRequires: libglade2-devel gtkglarea2-devel gtkglext-devel glade3-libgladeui-devel freeglut-devel -%ifnarch ppc64 -%define SHARP 1 -BuildRequires: mono-core -%define OCAML 1 -BuildRequires: ocaml -%endif - #-- Red Hat Enterprise Linux (also Centos) specific Build Requirements %if 0%{?rhel} +#%define SHARP 1 +#BuildRequires: mono-core +#%define OCAML 1 +#BuildRequires: ocaml +#%define LASI 1 +#BuildRequires: lasi-devel %define PYTHON 1 BuildRequires: python python-devel %endif #-- Fedora specific Build Requirements %if 0%{?fedora} +%ifnarch ppc64 +%define SHARP 1 +BuildRequires: mono-core +%define OCAML 1 +BuildRequires: ocaml +%endif +%define LASI 1 +BuildRequires: lasi-devel %define DEVIL 1 BuildRequires: DevIL-devel #define GLITZ 1 @@ -321,7 +328,9 @@ LD_LIBRARY_PATH=$RPM_INSTALL_PREFIX0/%{_lib} $RPM_INSTALL_PREFIX0/bin/dot -c %{_libdir}/graphviz/libgvplugin_gdk.so.* %{_libdir}/graphviz/libgvplugin_gs.so.* %{_libdir}/graphviz/libgvplugin_poppler.so.* +%if 0%{?LASI} %{_libdir}/graphviz/libgvplugin_lasi.so.* +%endif #-- graphviz-gd rpm -------------------------------------------------- %package gd @@ -851,7 +860,7 @@ CFLAGS="$RPM_OPT_FLAGS" \ --with-ghostscript \ --with%{!?GLITZ:out}-glitz \ --with-ipsepcola \ - --with-lasi \ + --with%{!?LASI:out}-lasi \ --with%{!?MING:out}-ming \ --with-qt \ --with-pangocairo \