From: pawelz <pawelz@pld-linux.org>
Date: Mon, 18 May 2009 10:02:09 +0000 (+0000)
Subject: - JDK bconds
X-Git-Tag: auto/ti/java-commons-daemon-1_0_1-5
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fjava-commons-daemon.git;a=commitdiff_plain;h=572f3ecb20c0bc00fc8291ab1771fa669907b1d4

- JDK bconds
- simplified (removed SHELL=/bin/sh and -Dbuild.compiler hacks)

Changed files:
    java-commons-daemon.spec -> 1.27
---

diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec
index bb8493e..680e246 100644
--- a/java-commons-daemon.spec
+++ b/java-commons-daemon.spec
@@ -1,5 +1,10 @@
 # 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
 
@@ -17,9 +22,11 @@ Patch0:		jakarta-commons-daemon-link.patch
 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
@@ -66,13 +73,7 @@ mv daemon-%{version}/* .
 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