packages: java-commons-dbcp/java-commons-dbcp.spec - Apply patch0. It is re...

[pawelz]

Author: pawelz                       Date: Mon May 18 10:57:12 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Apply patch0. It is realy needed for java >= 1.6

---- Files affected:
packages/java-commons-dbcp:
   java-commons-dbcp.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/java-commons-dbcp/java-commons-dbcp.spec
diff -u packages/java-commons-dbcp/java-commons-dbcp.spec:1.30 packages/java-commons-dbcp/java-commons-dbcp.spec:1.31
--- packages/java-commons-dbcp/java-commons-dbcp.spec:1.30	Mon May 18 12:04:18 2009
+++ packages/java-commons-dbcp/java-commons-dbcp.spec	Mon May 18 12:57:06 2009
@@ -103,12 +103,13 @@
 cp %{SOURCE1} tomcat5-build.xml
 %{__sed} -i -e 's,\r$,,' build.xml
 
-### It makes no sens when built with java-gcj-compat-devel
-# java_version=$(IFS=.; set -- $(java -fullversion 2>&1 | grep -o '".*"' | xargs); echo "$1.$2")
-# if ! awk -vv=$java_version 'BEGIN{exit(v >= 1.6)}'; then # java is at least 1.6
-# %%patch0 -p0
-# fi
 
+%if %{with java_sun}
+java_version=$(IFS=.; set -- $(java -fullversion 2>&1 | grep -o '".*"' | xargs); echo "$1.$2")
+if ! awk -vv=$java_version 'BEGIN{exit(v >= 1.6)}'; then # java is at least 1.6
+%patch0 -p0
+fi
+%endif
 %patch1 -p1
 
 %build
@@ -170,6 +171,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2009/05/18 10:57:06  pawelz
+- Apply patch0. It is realy needed for java >= 1.6
+
 Revision 1.30  2009/05/18 10:04:18  pawelz
 - JDK bconds
 - simplified (removed SHELL=/bin/sh and -Dbuild.compiler hacks)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-dbcp/java-commons-dbcp.spec?r1=1.30&r2=1.31&f=u