SPECS: java-axis.spec - jdk bconds - do not add tools and ecj to CLASSPATH ...

[pawelz]

Author: pawelz                       Date: Wed Apr  1 17:01:54 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- jdk bconds
- do not add tools and ecj to CLASSPATH (fixed in java-gcj-compat-devel)

---- Files affected:
SPECS:
   java-axis.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/java-axis.spec
diff -u SPECS/java-axis.spec:1.24 SPECS/java-axis.spec:1.25
--- SPECS/java-axis.spec:1.24	Wed Apr  1 18:22:10 2009
+++ SPECS/java-axis.spec	Wed Apr  1 19:01:48 2009
@@ -8,7 +8,12 @@
 #  - it won't compile with java 1.6. see:
 #    https://fcp.surfsite.org/modules/newbb/viewtopic.php?topic_id=55862&viewmode=flat&order=ASC&start=20
 
-%bcond_with	java_sun
+%if "%{pld_release}" == "ti"
+%bcond_without java_sun        # build with gcj
+%else
+%bcond_with    java_sun        # build with java-sun
+%endif
+
 %define		archivever %(echo %{version} | tr . _)
 %define		srcname	axis
 Summary:	A SOAP implementation in Java
@@ -46,6 +51,7 @@
 BuildRequires:	jsse
 BuildRequires:	java-junit
 BuildRequires:	logging-log4j
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	servletapi5
 Requires:	jaf
@@ -163,7 +169,7 @@
 #jimi_jar=$(find-jar jimi)
 
 CLASSPATH=$wsdl4j_jar:$commons_logging_jar:$commons_discovery_jar
-%{!?with_java_sun:CLASSPATH=$CLASSPATH:$(build-classpath ecj tools)}
+
 export CLASSPATH
 
 %ant dist \
@@ -238,6 +244,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2009/04/01 17:01:48  pawelz
+- jdk bconds
+- do not add tools and ecj to CLASSPATH (fixed in java-gcj-compat-devel)
+
 Revision 1.24  2009/04/01 16:22:10  pawelz
 - changed Name to java-axis
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-axis.spec?r1=1.24&r2=1.25&f=u