packages: java-commons-beanutils/java-commons-beanutils.spec - added JDK bc...

[pawelz]

Author: pawelz                       Date: Mon May 18 08:29:29 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added JDK bconds
- simplified

---- Files affected:
packages/java-commons-beanutils:
   java-commons-beanutils.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/java-commons-beanutils/java-commons-beanutils.spec
diff -u packages/java-commons-beanutils/java-commons-beanutils.spec:1.22 packages/java-commons-beanutils/java-commons-beanutils.spec:1.23
--- packages/java-commons-beanutils/java-commons-beanutils.spec:1.22	Mon Feb 16 10:05:10 2009
+++ packages/java-commons-beanutils/java-commons-beanutils.spec	Mon May 18 10:29:24 2009
@@ -2,6 +2,11 @@
 #
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
+%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
 #
@@ -19,9 +24,12 @@
 URL:		http://commons.apache.org/beanutils/
 BuildRequires:	java-commons-collections
 BuildRequires:	java-commons-logging
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	java-gcj-compat-devel
 BuildRequires:	jpackage-utils
 BuildRequires:	junit
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Suggests:	java-commons-collections
@@ -66,13 +74,7 @@
 export CLASSPATH=$(build-classpath $required_jars)
 export LC_ALL=en_US # sources are not in ASCII
 %ant clean
-%ant -Dbuild.compiler=extJavac jar bean-collections-dist
-
-%if %{with javadoc}
-export SHELL=/bin/sh
-%ant javadoc
-%endif
-
+%ant jar bean-collections-dist %{?with_javadoc:javadoc}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -116,6 +118,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2009/05/18 08:29:24  pawelz
+- added JDK bconds
+- simplified
+
 Revision 1.22  2009/02/16 09:05:10  ankry
 - adapterized
 
================================================================

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