patch new qhull paths on F24+ instead of using sed

This commit is contained in:
Dominik Mierzejewski
2016-06-18 00:05:02 +02:00
parent 1c7f1a4e48
commit da083597a2
2 changed files with 26 additions and 2 deletions

View File

@@ -64,6 +64,7 @@ Patch6: python-matplotlib-use-system-six.patch
Patch7: python-matplotlib-disable-failing-tests.patch
# https://github.com/matplotlib/matplotlib/issues/6538
Patch8: python-matplotlib-disable-failing-tests-armv7hl.patch
Patch9: python-matplotlib-qhull.patch
BuildRequires: freetype-devel
BuildRequires: libpng-devel
@@ -387,8 +388,7 @@ done
%if 0%{?fedora} > 24
# Installation paths changed
sed -i -e 's,\"qhull/qhull_a.h\",<libqhull/qhull_a.h>,' src/qhull_wrap.c
sed -i -e "s|os.path.join(x, 'qhull')|os.path.join(x, 'libqhull')|" setupext.py
%patch9 -p1 -b .qh
%endif
chmod -x lib/matplotlib/mpl-data/images/*.svg