SPECS: graphviz.spec - rel 2; fix java build

arekm arekm at pld-linux.org
Mon Jan 1 17:04:52 CET 2007


Author: arekm                        Date: Mon Jan  1 16:04:52 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2; fix java build

---- Files affected:
SPECS:
   graphviz.spec (1.65 -> 1.66) 

---- Diffs:

================================================================
Index: SPECS/graphviz.spec
diff -u SPECS/graphviz.spec:1.65 SPECS/graphviz.spec:1.66
--- SPECS/graphviz.spec:1.65	Wed Dec 27 17:09:48 2006
+++ SPECS/graphviz.spec	Mon Jan  1 17:04:47 2007
@@ -20,7 +20,7 @@
 Summary(pl):	Narzędzie do wizualizacji w postaci grafów
 Name:		graphviz
 Version:	2.12
-Release:	1
+Release:	2
 License:	CPL v1.0
 Group:		X11/Applications/Graphics
 Source0:	http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
@@ -43,7 +43,10 @@
 BuildRequires:	gtk+2-devel >= 2:2.8.0
 BuildRequires:	guile-devel >= 1.4
 #BuildRequires:	io
-%{?with_java:BuildRequires:	jdk}
+%if %{with java}
+BuildRequires:	jdk
+BuildRequires:	jpackage-utils
+%endif
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
@@ -255,6 +258,14 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+
+%if %{with java}
+JAVA_HOME=%{java_home}
+export JAVA_HOME
+CPPFLAGS="-I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
+export CPPFLAGS
+%endif
+
 %configure \
 	LUA=/usr/bin/lua51 \
 	%{!?with_java:--disable-java} \
@@ -465,6 +476,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.66  2007/01/01 16:04:47  arekm
+- rel 2; fix java build
+
 Revision 1.65  2006/12/27 16:09:48  qboosh
 - updated to 2.12, updated fontpath,php,gd,lua patches, removed obsolete python patch
 - enabled java by default (where jdk available)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/graphviz.spec?r1=1.65&r2=1.66&f=u



More information about the pld-cvs-commit mailing list