SPECS (DEVEL): java-modello.spec - unified jdk bconds - run javac - removed...

[pawelz]

Author: pawelz                       Date: Sun Mar 29 17:26:46 2009 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- unified jdk bconds
- run javac
- removed garbage from changelog

---- Files affected:
SPECS:
   java-modello.spec (1.2 -> 1.2.2.1) 

---- Diffs:

================================================================
Index: SPECS/java-modello.spec
diff -u SPECS/java-modello.spec:1.2 SPECS/java-modello.spec:1.2.2.1
--- SPECS/java-modello.spec:1.2	Fri Mar 27 21:46:41 2009
+++ SPECS/java-modello.spec	Sun Mar 29 19:26:41 2009
@@ -5,14 +5,14 @@
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
 %bcond_without	tests		# don't build and run tests
+%bcond_with	java_sun	# build with gcj
+
 %if "%{pld_release}" == "ti"
-%bcond_without	java_sun	# build with gcj
-%else
-%bcond_with	java_sun	# build with java-sun
+%define	with_java_sun	1
 %endif
-#
+
 %include	/usr/lib/rpm/macros.java
-#
+
 %define		srcname		modello
 Summary:	Data Model toolkit
 Name:		java-modello
@@ -71,7 +71,8 @@
 export JAVA_HOME="%{java_home}"
 
 install -d build
-#%javac -classpath $CLASSPATH -source 1.5 -target 1.5 -d build $(find -name '*.java')
+#%%javac -classpath $CLASSPATH -source 1.5 -target 1.5 -d build $(find -name '*.java')
+%javac -source 1.5 -target 1.5 -d build $(find -name '*.java')
 
 %if %{with javadoc}
 %javadoc -d apidocs \
@@ -119,19 +120,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2.2.1  2009/03/29 17:26:41  pawelz
+- unified jdk bconds
+- run javac
+- removed garbage from changelog
+
 Revision 1.2  2009/03/27 20:46:41  pawelz
 - fixed Source0
 
 Revision 1.1  2009/03/27 20:44:09  pawelz
 - initial
-
-Revision 1.2  2009/03/26 21:29:57  paszczus
-- switched to sources
-- use proper javadoc
-- added java_sun bcond
-- conditional bcond for Titanium
-
-Revision 1.1  2009/02/06 18:04:28  pawelz
-- initial PLD release
-
-
================================================================

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