include fix

java directories passed to configure

diff --git a/libkml-include.patch b/libkml-include.patch
new file mode 100644 (file)
index 0000000..96e6f5f
--- /dev/null
+++ b/libkml-include.patch
@@ -0,0 +1,10 @@
+--- libkml-1.2.0/src/kml/base/file_posix.cc.old        2010-01-14 01:16:30.000000000 +0100
++++ libkml-1.2.0/src/kml/base/file_posix.cc    2014-02-17 15:42:51.044404305 +0100
+@@ -31,6 +31,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+ 
+ namespace kmlbase {
+ 

diff --git a/libkml.spec b/libkml.spec
index 6f27f6744132a9c5edfd33cac8948ec939b85ae5..b53f99c5df85ce8a678f571d7e6745aaa9b15c7a 100644 (file)
--- a/libkml.spec
+++ b/libkml.spec
@@ -16,6 +16,7 @@ Source0:      http://libkml.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:                %{name}-sh.patch
 Patch1:                %{name}-system-libs.patch
 Patch2:                %{name}-link.patch
+Patch3:                %{name}-include.patch
 URL:           http://code.google.com/p/libkml/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9.6
@@ -28,6 +29,7 @@ BuildRequires:        libstdc++-devel >= 6:4.0
 BuildRequires: libtool >= 2:1.5
 BuildRequires: python-devel >= 2.3
 BuildRequires: rpm-pythonprov
+%{?with_java:BuildRequires:    rpm-javaprov}
 BuildRequires: rpmbuild(macros) >= 1.219
 BuildRequires: sed >= 4.0
 BuildRequires: swig >= 1.3.35
@@ -115,6 +117,7 @@ Oparte na SWIG-u wiązania Pythona do bibliotek KML.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # error: ISO C++ 1998 does not support 'long long'
 %{__sed} -i -e 's/ -Werror//' configure.ac $(find . -name Makefile.am | xargs grep -l -e '-Werror')
@@ -127,6 +130,8 @@ Oparte na SWIG-u wiązania Pythona do bibliotek KML.
 %{__automake}
 %configure \
        %{!?with_java:--disable-java} \
+       %{?with_java:--with-java-include-dir=%{_jvmdir}/java/include} \
+       %{?with_java:--with-java-lib-dir=%{_jvmdir}/java/lib} \
        %{!?with_static_libs:--disable-static}
 %{__make}