packages: java-commons-fileupload/java-commons-fileupload.spec - conditiona...

pawelz pawelz at pld-linux.org
Mon May 18 15:45:58 CEST 2009


Author: pawelz                       Date: Mon May 18 13:45:58 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- conditional JDK bconds
- drop -Dbuild.classpath (no longer needed)

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

---- Diffs:

================================================================
Index: packages/java-commons-fileupload/java-commons-fileupload.spec
diff -u packages/java-commons-fileupload/java-commons-fileupload.spec:1.30 packages/java-commons-fileupload/java-commons-fileupload.spec:1.31
--- packages/java-commons-fileupload/java-commons-fileupload.spec:1.30	Mon Mar 16 00:52:34 2009
+++ packages/java-commons-fileupload/java-commons-fileupload.spec	Mon May 18 15:45:53 2009
@@ -5,7 +5,11 @@
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
-%bcond_with	java_sun	# use java_sun jdk
+%if "%{pld_release}" == "ti"
+%bcond_without	java_sun	# build with gcj
+%else
+%bcond_with	java_sun	# build with java-sun
+%endif
 
 %include	/usr/lib/rpm/macros.java
 
@@ -75,7 +79,6 @@
 export CLASSPATH
 
 %ant jar \
-	%{!?with_java_sun:-Dbuild.compiler=extJavac} \
 	-Dbuild.sysclasspath=first \
 	-Dfinal.name=commons-fileupload-%{version}
 
@@ -122,6 +125,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2009/05/18 13:45:53  pawelz
+- conditional JDK bconds
+- drop -Dbuild.classpath (no longer needed)
+
 Revision 1.30  2009/03/15 23:52:34  pawelz
 - cosmetics
 - rel 1 (ufff, at last it builds and works)
================================================================

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



More information about the pld-cvs-commit mailing list