From 8af434653c4d710039e5a75752d3a1863fb94257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 7 May 2021 20:48:54 +0200 Subject: [PATCH] Conditionalized guile support Resolves: rhbz#1953974 Updated RHEL macros Resolves: rhbz#1957653 --- graphviz.spec | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/graphviz.spec b/graphviz.spec index c9f565e..ecec19e 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -1,7 +1,9 @@ -%if 0%{?rhel} == 8 +%if 0%{?rhel} >= 8 %bcond_with php +%bcond_with guile %else %bcond_without php +%bcond_without guile %endif %bcond_with python2 @@ -41,6 +43,12 @@ %global PHP 0 %endif +%if %{with guile} +%global GUILE 1 +%else +%global GUILE 0 +%endif + # Plugins version %global pluginsver 6 @@ -60,7 +68,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 2.44.0 -Release: 18%{?dist} +Release: 19%{?dist} License: EPL-1.0 URL: http://www.graphviz.org/ Source0: https://gitlab.com/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2 @@ -71,7 +79,10 @@ Patch1: graphviz-2.42.2-coverity-scan-fixes.patch Patch2: graphviz-2.44.0-man-fix.patch BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2 BuildRequires: ksh, bison, m4, flex, tk-devel, tcl-devel >= 8.3, swig, sed -BuildRequires: fontconfig-devel, libtool-ltdl-devel, ruby-devel, ruby, guile-devel +BuildRequires: fontconfig-devel, libtool-ltdl-devel, ruby-devel, ruby +%if %{GUILE} +BuildRequires: guile-devel +%endif %if %{with python2} BuildRequires: python2-devel %endif @@ -162,12 +173,14 @@ Summary: Demo graphs for graphviz %description graphs Some demo graphs for graphviz. +%if %{GUILE} %package guile Summary: Guile extension for graphviz Requires: %{name} = %{version}-%{release}, guile %description guile Guile extension for graphviz. +%endif %package java Summary: Java extension for graphviz @@ -324,7 +337,12 @@ export CPPFLAGS=-I`ruby -e "puts File.join(RbConfig::CONFIG['includedir'], RbCon --without-devil \ %endif %if ! %{QTAPPS} - --without-qt + --without-qt \ +%endif +%if %{GUILE} + --enable-guile=yes +%else + --enable-guile=no %endif # drop rpath @@ -507,9 +525,11 @@ php --no-php-ini \ %dir %{_datadir}/graphviz %{_datadir}/graphviz/graphs +%if %{GUILE} %files guile %{_libdir}/graphviz/guile/ %{_mandir}/man3/gv.3guile* +%endif %files java %{_libdir}/graphviz/java/ @@ -581,6 +601,12 @@ php --no-php-ini \ %{_mandir}/man3/*.3tcl* %changelog +* Fri May 7 2021 Jaroslav Škarvada - 2.44.0-19 +- Conditionalized guile support + Resolves: rhbz#1953974 +- Updated RHEL macros + Resolves: rhbz#1957653 + * Thu Apr 15 2021 Mohan Boddu - 2.44.0-18 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937