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

set --enable-java=no for non java arches

Browse Source 
removed removal of g3java man pages, was redundant
This commit is contained in:
Jiri 2022-07-15 17:59:45 +02:00
parent e40b044aa2
commit 4b5281594a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
graphviz.spec
View File

@ -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 # 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` 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 \ %configure --with-x --disable-static --disable-dependency-tracking \
%if ! %{JAVA}
--enable-java=no \
%endif
--without-mylibgd --with-ipsepcola --with-pangocairo \ --without-mylibgd --with-ipsepcola --with-pangocairo \
--with-gdk-pixbuf --with-visio --disable-silent-rules --enable-lefty \ --with-gdk-pixbuf --with-visio --disable-silent-rules --enable-lefty \
%if ! %{LASI} %if ! %{LASI}
@ -498,8 +501,6 @@ if [ "%{_prefix}" != "/usr" ]; then
rm -rf %{buildroot}/usr/* rm -rf %{buildroot}/usr/*
fi fi
rm -v %{buildroot}%{_mandir}/man3/gv.3java*
%check %check
%if %{PHP} %if %{PHP}
# Minimal load test of php extension # Minimal load test of php extension
@ -714,8 +715,8 @@ php --no-php-ini \
* Fri Jul 15 2022 Jiri Vanek <jvanek@redhat.com> - 5.0.0-2 * Fri Jul 15 2022 Jiri Vanek <jvanek@redhat.com> - 5.0.0-2
- adapted to removal of java on i686 - adapted to removal of java on i686
- finsihing merged https://src.fedoraproject.org/rpms/graphviz/pull-request/9#request_diff - finsihing merged https://src.fedoraproject.org/rpms/graphviz/pull-request/9#request_diff
- NOT ifed out on i686 recomanded rm -v... - ifed out on i686 recomanded rm -v...
-- it breaks build, most likely deeper involved issue - set --enable-java=no for non java arches
- added changelog entry, bumped release - added changelog entry, bumped release
- https://bugzilla.redhat.com/show_bug.cgi?id=2104225 - https://bugzilla.redhat.com/show_bug.cgi?id=2104225