From 4b5281594a03954828d202bde763518bd8cf0f78 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 15 Jul 2022 17:59:45 +0200 Subject: [PATCH] set --enable-java=no for non java arches removed removal of g3java man pages, was redundant --- graphviz.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/graphviz.spec b/graphviz.spec index 170f5c1..f53a6e4 100644 --- a/graphviz.spec +++ b/graphviz.spec @@ -393,6 +393,9 @@ sed -i 's|sitearchdir|vendorarchdir|' config/config_ruby.rb # get the path to search for ruby/config.h to CPPFLAGS, so that configure can find it export CPPFLAGS=-I`ruby -e "puts File.join(RbConfig::CONFIG['includedir'], RbConfig::CONFIG['sitearch'])" || echo /dev/null` %configure --with-x --disable-static --disable-dependency-tracking \ +%if ! %{JAVA} +--enable-java=no \ +%endif --without-mylibgd --with-ipsepcola --with-pangocairo \ --with-gdk-pixbuf --with-visio --disable-silent-rules --enable-lefty \ %if ! %{LASI} @@ -498,8 +501,6 @@ if [ "%{_prefix}" != "/usr" ]; then rm -rf %{buildroot}/usr/* fi -rm -v %{buildroot}%{_mandir}/man3/gv.3java* - %check %if %{PHP} # Minimal load test of php extension @@ -714,8 +715,8 @@ php --no-php-ini \ * Fri Jul 15 2022 Jiri Vanek - 5.0.0-2 - adapted to removal of java on i686 - finsihing merged https://src.fedoraproject.org/rpms/graphviz/pull-request/9#request_diff -- NOT ifed out on i686 recomanded rm -v... --- it breaks build, most likely deeper involved issue +- ifed out on i686 recomanded rm -v... +- set --enable-java=no for non java arches - added changelog entry, bumped release - https://bugzilla.redhat.com/show_bug.cgi?id=2104225