rpms/graphviz
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Conditionalized guile support

Browse Source 
Resolves: rhbz#1953974
Updated RHEL macros
  Resolves: rhbz#1957653
This commit is contained in:
Jaroslav Škarvada 2021-05-07 20:48:54 +02:00
parent 88d56d08a3
commit 8af434653c
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
graphviz.spec
View File

@ -1,7 +1,9 @@
%if 0%{?rhel} == 8 %if 0%{?rhel} >= 8
%bcond_with php %bcond_with php
%bcond_with guile
%else %else
%bcond_without php %bcond_without php
%bcond_without guile
%endif %endif
%bcond_with python2 %bcond_with python2
@ -41,6 +43,12 @@
%global PHP 0 %global PHP 0
%endif %endif
%if %{with guile}
%global GUILE 1
%else
%global GUILE 0
%endif
# Plugins version # Plugins version
%global pluginsver 6 %global pluginsver 6
@ -60,7 +68,7 @@
Name: graphviz Name: graphviz
Summary: Graph Visualization Tools Summary: Graph Visualization Tools
Version: 2.44.0 Version: 2.44.0
Release: 18%{?dist} Release: 19%{?dist}
License: EPL-1.0 License: EPL-1.0
URL: http://www.graphviz.org/ URL: http://www.graphviz.org/
Source0: https://gitlab.com/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2 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 Patch2: graphviz-2.44.0-man-fix.patch
BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, expat-devel, freetype-devel >= 2 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: 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} %if %{with python2}
BuildRequires: python2-devel BuildRequires: python2-devel
%endif %endif
@ -162,12 +173,14 @@ Summary: Demo graphs for graphviz
%description graphs %description graphs
Some demo graphs for graphviz. Some demo graphs for graphviz.
%if %{GUILE}
%package guile %package guile
Summary: Guile extension for graphviz Summary: Guile extension for graphviz
Requires: %{name} = %{version}-%{release}, guile Requires: %{name} = %{version}-%{release}, guile
%description guile %description guile
Guile extension for graphviz. Guile extension for graphviz.
%endif
%package java %package java
Summary: Java extension for graphviz Summary: Java extension for graphviz
@ -324,7 +337,12 @@ export CPPFLAGS=-I`ruby -e "puts File.join(RbConfig::CONFIG['includedir'], RbCon
--without-devil \ --without-devil \
%endif %endif
%if ! %{QTAPPS} %if ! %{QTAPPS}
--without-qt --without-qt \
%endif
%if %{GUILE}
--enable-guile=yes
%else
--enable-guile=no
%endif %endif
# drop rpath # drop rpath
@ -507,9 +525,11 @@ php --no-php-ini \
%dir %{_datadir}/graphviz %dir %{_datadir}/graphviz
%{_datadir}/graphviz/graphs %{_datadir}/graphviz/graphs
%if %{GUILE}
%files guile %files guile
%{_libdir}/graphviz/guile/ %{_libdir}/graphviz/guile/
%{_mandir}/man3/gv.3guile* %{_mandir}/man3/gv.3guile*
%endif
%files java %files java
%{_libdir}/graphviz/java/ %{_libdir}/graphviz/java/
@ -581,6 +601,12 @@ php --no-php-ini \
%{_mandir}/man3/*.3tcl* %{_mandir}/man3/*.3tcl*
%changelog %changelog
* Fri May 7 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 2.44.0-19
- Conditionalized guile support
Resolves: rhbz#1953974
- Updated RHEL macros
Resolves: rhbz#1957653
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.44.0-18 * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 2.44.0-18
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937