From 6ccfe31136dd34627848035a3437cfa8a8a72d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Fri, 29 Apr 2016 15:14:23 +0200 Subject: [PATCH] Rebuild for qhull-2015.2-1. - Reflect qhull.h/libqhull.h's location having changed. --- PyMca.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/PyMca.spec b/PyMca.spec index 63f2225..138afc2 100644 --- a/PyMca.spec +++ b/PyMca.spec @@ -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"||' \ +%if 0%{?fedora} > 24 + -e 's|"libqhull.h"||' \ +%else -e 's|"libqhull.h"||' \ +%endif -e 's|"poly.h"||' \ -e 's|"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 - 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 - 4.7.3-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild