Rebuild for qhull-2015.2-1.

- Reflect qhull.h/libqhull.h's location having changed.
This commit is contained in:
Ralf Corsépius 2016-04-29 15:14:23 +02:00
commit 6ccfe31136

View file

@ -7,7 +7,7 @@
Name: PyMca
Version: 4.7.3
Release: 5%{?dist}
Release: 6%{?dist}
Summary: PyMca X-ray Fluorescence Toolkit
License: GPLv2+
URL: http://pymca.sourceforge.net/
@ -75,7 +75,11 @@ This package contains photon interaction data/elements data for %{name}.
rm -frv third-party/
# Patch for the craps qhull brings in.
sed -i -e 's|"geom.h"|<geom.h>|' \
%if 0%{?fedora} > 24
-e 's|"libqhull.h"|<libqhull.h>|' \
%else
-e 's|"libqhull.h"|<qhull.h>|' \
%endif
-e 's|"poly.h"|<poly.h>|' \
-e 's|"qset.h"|<qset.h>|' \
PyMca/Object3D/Object3DQhull/Object3DQhull.c
@ -91,7 +95,11 @@ sed -i "s|!python|!%{__python2}|g" PyMca/scripts/pymcapostbatch
# Need to define manually. Note using pkg-config to export the cflags
# is not identified by the setup.py script as it requires non-blank
# stdin for both CFLAGS/LDFLAGS, so we manually define the CFLAGS.
%if 0%{?fedora} > 24
QHULL_CFLAGS="-I%{_includedir}/libqhull" \
%else
QHULL_CFLAGS="-I%{_includedir}/qhull" \
%endif
QHULL_LIBS="-lqhull" \
SPECFILE_USE_GNU_SOURCE=1 \
%if 0%{?with_python3}
@ -274,6 +282,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_pkgdocdir}/
%changelog
* Fri Apr 29 2016 Ralf Corsépius <corsepiu@fedoraproject.org> - 4.7.3-6
- Rebuild for qhull-2015.2-1.
- Reflect qhull.h/libqhull.h's location having changed.
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild