From 73ae39950df1f75aac6662672cade19e6f4885f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 14 Oct 2022 15:04:20 +0200 Subject: [PATCH] More fixes for conditional build of smyrna --- graphviz.spec | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/graphviz.spec b/graphviz.spec index 9556b3b..118c2d5 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -81,7 +81,7 @@ Name: graphviz Summary: Graph Visualization Tools Version: 6.0.2 -Release: 2%{?dist} +Release: 3%{?dist} License: EPL-1.0 URL: http://www.graphviz.org/ Source0: https://gitlab.com/%{name}/%{name}/-/archive/%{version}/%{name}-%{version}.tar.bz2 @@ -507,6 +507,11 @@ if [ "%{_prefix}" != "/usr" ]; then rm -rf %{buildroot}/usr/* fi +# Explicitly create examples directory to always have it. +# At the moment there are only examples dependant on smyrna. I.e. if smyrna is not +# built this directory is empty. +mkdir -p %{buildroot}%{_datadir}/%{name}/examples + %check %if %{PHP} # Minimal load test of php extension @@ -569,12 +574,14 @@ php --no-php-ini \ %files %doc %{_docdir}/%{name} +%if %{GTS} %exclude %{_bindir}/smyrna +%exclude %{_mandir}/man1/smyrna.1* +%endif %{_bindir}/* %dir %{_libdir}/graphviz %{_libdir}/*.so.* %{_libdir}/graphviz/*.so.* -%exclude %{_mandir}/man1/smyrna.1* %{_mandir}/man1/*.1* %{_mandir}/man7/*.7* %dir %{_datadir}/%{name} @@ -720,6 +727,9 @@ php --no-php-ini \ %endif %changelog +* Fri Oct 14 2022 Jaroslav Škarvada - 6.0.2-3 +- More fixes for conditional build of smyrna + * Fri Oct 14 2022 Jaroslav Škarvada - 6.0.2-2 - Made smyrna dependant on GTS