SPECS: java-commons-digester.spec - with_java_sun for Titanium - simplified...

[pawelz]

Author: pawelz                       Date: Sun Mar 29 01:25:18 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- with_java_sun for Titanium
- simplified (some hacks are no longer needed)

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

---- Diffs:

================================================================
Index: SPECS/java-commons-digester.spec
diff -u SPECS/java-commons-digester.spec:1.24 SPECS/java-commons-digester.spec:1.25
--- SPECS/java-commons-digester.spec:1.24	Mon Feb 16 09:19:22 2009
+++ SPECS/java-commons-digester.spec	Sun Mar 29 03:25:13 2009
@@ -2,6 +2,11 @@
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
+%bcond_with     java_sun        # build with java-sun
+
+%if "%{pld_release}" == "ti"
+%define		with_java_sun
+%else
 
 %include	/usr/lib/rpm/macros.java
 
@@ -20,7 +25,8 @@
 BuildRequires:	java-commons-beanutils
 BuildRequires:	java-commons-collections
 BuildRequires:	java-commons-logging
-BuildRequires:	java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -74,12 +80,8 @@
 required_jars="commons-beanutils-core commons-collections commons-logging"
 CLASSPATH=$(build-classpath $required_jars)
 export CLASSPATH
-export SHELL=/bin/sh
-%ant clean
-%ant -Dbuild.compiler=extJavac dist javadoc
 
-%if %{with javadoc}
-%endif
+%ant clean dist
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -120,6 +122,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2009/03/29 01:25:13  pawelz
+- with_java_sun for Titanium
+- simplified (some hacks are no longer needed)
+
 Revision 1.24  2009/02/16 08:19:22  pawelz
 - use java-gcj-compat-devel
 - correct dir for javadoc
================================================================

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