- use proper path to gdal includes

diff --git a/pfstools-gdal.patch b/pfstools-gdal.patch
new file mode 100644 (file)
index 0000000..7cc269e
--- /dev/null
+++ b/pfstools-gdal.patch
@@ -0,0 +1,28 @@
+--- pfstools-1.9.1/configure.ac~       2014-11-10 22:14:16.000000000 +0100
++++ pfstools-1.9.1/configure.ac        2014-11-10 23:55:31.223091067 +0100
+@@ -449,6 +449,7 @@
+   [AC_DEFINE( HAVE_LIBGDAL,1,
+             [Define this if you have the GDAL library])
+             GDAL_LIBS="-lgdal"
++            GDAL_CFLAGS="-I/usr/include/gdal"
+               gdal_support="yes"],[gdal_support="no"],)
+ else
+   gdal_support="no"
+@@ -508,6 +509,7 @@
+ AC_SUBST(IMAGEMAGICK_CFLAGS)
+ AC_SUBST(JPEGHDR_LIBS)
+ AC_SUBST(GDAL_LIBS)
++AC_SUBST(GDAL_CFLAGS)
+ AC_SUBST(QT_LIBS)
+ AC_SUBST(QT_CFLAGS)
+ AC_SUBST(GL_LIBS)
+--- pfstools-1.9.1/src/fileformat/Makefile.am~ 2014-11-06 13:50:48.000000000 +0100
++++ pfstools-1.9.1/src/fileformat/Makefile.am  2014-11-10 23:56:27.736422407 +0100
+@@ -97,6 +97,7 @@
+ if GDAL_SUPPORT
+ pfsingdal_SOURCES = pfsingdal.cpp
+ pfsingdal_LDADD = $(GDAL_LIBS)
++INCLUDES += $(GDAL_CFLAGS)
+ endif
+ 
+ pfsinrgbe_SOURCES = pfsinrgbe.cpp rgbeio.cpp rgbeio.h

diff --git a/pfstools.spec b/pfstools.spec
index 54faf335618606368626bd5c507180111f678fea..995406c9e3f389ce4b7b953f28cceb23bf0a7a61 100644 (file)
--- a/pfstools.spec
+++ b/pfstools.spec
@@ -13,6 +13,7 @@ Group:                Libraries
 Source0:       http://downloads.sourceforge.net/pfstools/%{name}-%{version}.tar.gz
 # Source0-md5: f6f5966e248fd6979e6339725ea19c99
 Patch0:                %{name}-opt.patch
+Patch1:                %{name}-gdal.patch
 URL:           http://pfstools.sourceforge.net/
 BuildRequires: ImageMagick-c++-devel >= 6.0
 BuildRequires: OpenEXR-devel >= 1.0
@@ -101,6 +102,7 @@ Wiązania języka Octave do pfstools.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}