[packages/libkml] include fix java directories passed to configure

bszx bszx at pld-linux.org
Tue Apr 8 17:07:47 CEST 2014


commit f0aed1e16a3d853bf814401d2a2006b62966240a
Author: Bartek Szady <bszx at bszx.eu.org>
Date:   Tue Apr 8 16:35:07 2014 +0200

    include fix
    java directories passed to configure

 libkml-include.patch | 10 ++++++++++
 libkml.spec          |  5 +++++
 2 files changed, 15 insertions(+)
---
diff --git a/libkml.spec b/libkml.spec
index 6f27f67..b53f99c 100644
--- 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}
 
diff --git a/libkml-include.patch b/libkml-include.patch
new file mode 100644
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 {
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libkml.git/commitdiff/f0aed1e16a3d853bf814401d2a2006b62966240a



More information about the pld-cvs-commit mailing list