SPECS: java-commons-fileupload.spec - javadoc hacks - jdk deps - java_sun b...

[pawelz]

Author: pawelz                       Date: Sun Mar 15 23:29:01 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- javadoc hacks
- jdk deps
- java_sun bcond

---- Files affected:
SPECS:
   java-commons-fileupload.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: SPECS/java-commons-fileupload.spec
diff -u SPECS/java-commons-fileupload.spec:1.26 SPECS/java-commons-fileupload.spec:1.27
--- SPECS/java-commons-fileupload.spec:1.26	Mon Mar 16 00:13:29 2009
+++ SPECS/java-commons-fileupload.spec	Mon Mar 16 00:28:55 2009
@@ -5,6 +5,7 @@
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
+%bcond_with	java_sun	# use java_sun jdk
 
 %include	/usr/lib/rpm/macros.java
 
@@ -23,6 +24,8 @@
 BuildRequires:	ant-junit >= 1.5
 BuildRequires:	java-commons-io
 BuildRequires:	servletapi >= 2.3
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	jpackage-utils
 BuildRequires:	junit >= 3.8.1
 BuildRequires:	portletapi = 1.0
@@ -72,17 +75,20 @@
 CLASSPATH=$(build-classpath $required_jars)
 export CLASSPATH
 
-%ant dist \
-	-Dbuild.compiler=extJavac \
+%ant jar \
+	%{!?with_java_sun:-Dbuild.compiler=extJavac} \
 	-Dbuild.sysclasspath=first \
 	-Dfinal.name=commons-fileupload-%{version}
 
+%{?with_javadoc:%ant jar -Dfinal.name=commons-fileupload-%{version}}
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 
 # install jars
-cp -a dist/commons-fileupload-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+cp -a target/commons-fileupload-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
 ln -s commons-fileupload-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-fileupload.jar
 
 # javadoc
@@ -116,6 +122,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2009/03/15 23:28:55  pawelz
+- javadoc hacks
+- jdk deps
+- java_sun bcond
+
 Revision 1.26  2009/03/15 23:13:29  pawelz
 - set build.sysclasspath=first property
 
================================================================

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