packages: java-commons-daemon/java-commons-daemon.spec - JDK bconds - simpl...

[pawelz]

Author: pawelz                       Date: Mon May 18 10:02:14 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- JDK bconds
- simplified (removed SHELL=/bin/sh and -Dbuild.compiler hacks)

---- Files affected:
packages/java-commons-daemon:
   java-commons-daemon.spec (1.26 -> 1.27) 

---- Diffs:

================================================================
Index: packages/java-commons-daemon/java-commons-daemon.spec
diff -u packages/java-commons-daemon/java-commons-daemon.spec:1.26 packages/java-commons-daemon/java-commons-daemon.spec:1.27
--- packages/java-commons-daemon/java-commons-daemon.spec:1.26	Thu Feb 12 17:39:52 2009
+++ packages/java-commons-daemon/java-commons-daemon.spec	Mon May 18 12:02:09 2009
@@ -1,6 +1,11 @@
 # $Revision$, $Date$
 # 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
 
@@ -18,9 +23,11 @@
 URL:		http://commons.apache.org/daemon/
 BuildRequires:	ant >= 1.4.1
 BuildRequires:	automake
-BuildRequires:	java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
 BuildRequires:	jpackage-utils
 BuildRequires:	junit >= 3.7
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	xmlto >= 0:0.0.18-1
@@ -67,13 +74,7 @@
 required_jars="junit"
 CLASSPATH=$(build-classpath $required_jars)
 export CLASSPATH
-%ant -Dbuild.compiler=extJavac jar
-
-# javadoc
-%if %{with javadoc}
-export SHELL=/bin/sh
-%ant javadoc
-%endif
+%ant jar %{?with_javadoc:javadoc}
 
 # native part
 cd src/native/unix
@@ -128,6 +129,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2009/05/18 10:02:09  pawelz
+- JDK bconds
+- simplified (removed SHELL=/bin/sh and -Dbuild.compiler hacks)
+
 Revision 1.26  2009/02/12 16:39:52  pawelz
 - unified %%build
 - more %%docs
================================================================

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