SPECS: odtransform.spec - added with java_sun bcond - this source code is n...

[pawelz]

Author: pawelz                       Date: Fri Mar 13 12:48:27 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added with java_sun bcond
- this source code is not compatibile with jdk < 1.5

---- Files affected:
SPECS:
   odtransform.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/odtransform.spec
diff -u SPECS/odtransform.spec:1.20 SPECS/odtransform.spec:1.21
--- SPECS/odtransform.spec:1.20	Thu Mar 12 23:34:19 2009
+++ SPECS/odtransform.spec	Fri Mar 13 13:48:22 2009
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-
+%bcond_with	java_sun
 %define		snap	19
 %include	/usr/lib/rpm/macros.java
 Summary:	OpenDocument to XML FOP converter
@@ -16,9 +16,10 @@
 Source2:	%{name}-ooo2xslfo.xslt
 Source3:	%{name}.mf
 URL:		http://svn.clazzes.org/svn/odtransform/
-BuildRequires:	gcj
 BuildRequires:	jar
 BuildRequires:	java-commons-logging
+%{?without_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun >= 1.5}
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -47,8 +48,7 @@
 %build
 required_jars="commons-logging"
 CLASSPATH=$(build-classpath $required_jars)
-export CLASSPATH
-gcj -C main/java/org/clazzes/odtransform/*.java
+%javac -cp $CLASSPATH -source '1.5' -target '1.5' main/java/org/clazzes/odtransform/*.java
 cd main/java
 %jar cf ../../odtransform-%{version}.jar org/clazzes/odtransform/*.class
 cd ../resources
@@ -83,6 +83,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2009/03/13 12:48:22  pawelz
+- added with java_sun bcond
+- this source code is not compatibile with jdk < 1.5
+
 Revision 1.20  2009/03/12 22:34:19  pawelz
 - fixed jar args order. Now it works with both jar implementations.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/odtransform.spec?r1=1.20&r2=1.21&f=u