Author: arekm Date: Sat Sep 10 18:52:14 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 5; fix build with qhull 2011.1
---- Files affected: packages/plplot: plplot.spec (1.50 -> 1.51) , plplot-qhull.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/plplot/plplot.spec diff -u packages/plplot/plplot.spec:1.50 packages/plplot/plplot.spec:1.51 --- packages/plplot/plplot.spec:1.50 Wed Aug 31 11:18:28 2011 +++ packages/plplot/plplot.spec Sat Sep 10 20:52:09 2011 @@ -9,12 +9,13 @@ Summary(pl.UTF-8): PLplot - biblioteka funkcji przydatnych do tworzenia wykresów naukowych Name: plplot Version: 5.9.6 -Release: 4 +Release: 5 License: LGPL Group: Libraries Source0: http://dl.sourceforge.net/plplot/%{name}-%{version}.tar.gz # Source0-md5: 772c772bde3a107e5f06d21cefa7f6b6 Patch0: %{name}-octave.patch +Patch1: %{name}-qhull.patch URL: http://plplot.sourceforge.net/ BuildRequires: QtGui-devel BuildRequires: QtSvg-devel @@ -46,7 +47,7 @@ BuildRequires: python-numpy-devel >= 15.3 BuildRequires: python-devel >= 1:2.3 BuildRequires: python-pygtk-devel >= 2:2.12.1 -BuildRequires: qhull-devel +BuildRequires: qhull-devel >= 2011.1 BuildRequires: qt4-build BuildRequires: qt4-qmake BuildRequires: rpm-pythonprov @@ -416,6 +417,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build mkdir build @@ -728,6 +730,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.51 2011/09/10 18:52:09 arekm +- rel 5; fix build with qhull 2011.1 + Revision 1.50 2011/08/31 09:18:28 arekm - release 4 ================================================================ Index: packages/plplot/plplot-qhull.patch diff -u /dev/null packages/plplot/plplot-qhull.patch:1.1 --- /dev/null Sat Sep 10 20:52:14 2011 +++ packages/plplot/plplot-qhull.patch Sat Sep 10 20:52:09 2011 @@ -0,0 +1,33 @@ +--- plplot-5.9.6/cmake/modules/FindQHULL.cmake~ 2011-09-10 20:48:59.000000000 +0200 ++++ plplot-5.9.6/cmake/modules/FindQHULL.cmake 2011-09-10 20:49:10.134306362 +0200 +@@ -9,7 +9,7 @@ + + find_path( + QHULL_INCLUDE_DIR +- qhull/qhull_a.h ++ libqhull/qhull_a.h + /usr/local/include + /usr/include + ) +--- plplot-5.9.6/src/plgridd.c~ 2010-06-05 18:11:39.000000000 +0200 ++++ plplot-5.9.6/src/plgridd.c 2011-09-10 20:50:09.332285828 +0200 +@@ -32,7 +32,7 @@ + + #ifdef HAVE_QHULL + #include "../lib/nn/nn.h" +-#include <qhull/qhull_a.h> ++#include <libqhull/qhull_a.h> + #endif + + /* forward declarations */ +--- plplot-5.9.6/lib/nn/delaunay.c~ 2010-06-05 18:11:40.000000000 +0200 ++++ plplot-5.9.6/lib/nn/delaunay.c 2011-09-10 20:50:20.115858331 +0200 +@@ -34,7 +34,7 @@ + #include <limits.h> + #include <float.h> + #ifdef USE_QHULL +-#include <qhull/qhull_a.h> ++#include <libqhull/qhull_a.h> + #else + #include "triangle.h" + #endif ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/plplot/plplot.spec?r1=1.50&r2=1.51&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
