packages: java-commons-pool/java-commons-pool.spec - JDK bconds - simplifie...
pawelz
pawelz at pld-linux.org
Mon May 18 12:16:16 CEST 2009
Author: pawelz Date: Mon May 18 10:16:16 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- JDK bconds
- simplified (removed SHELL=/bin/sh and -Dbuild.compiler hacks)
---- Files affected:
packages/java-commons-pool:
java-commons-pool.spec (1.29 -> 1.30)
---- Diffs:
================================================================
Index: packages/java-commons-pool/java-commons-pool.spec
diff -u packages/java-commons-pool/java-commons-pool.spec:1.29 packages/java-commons-pool/java-commons-pool.spec:1.30
--- packages/java-commons-pool/java-commons-pool.spec:1.29 Mon Feb 16 08:47:40 2009
+++ packages/java-commons-pool/java-commons-pool.spec Mon May 18 12:16:10 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,8 +24,10 @@
URL: http://commons.apache.org/pool/
BuildRequires: ant
BuildRequires: java-commons-collections >= 1.0
-BuildRequires: java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
BuildRequires: jpackage-utils
+BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
Requires: java-commons-collections >= 1.0
@@ -74,13 +81,8 @@
required_jars="commons-collections"
export CLASSPATH=$(build-classpath $required_jars)
%ant clean
-%ant -Dbuild.compiler=extJavac build-jar
-%ant -Dbuild.compiler=extJavac -f tomcat5-build.xml
-
-%if %{with javadoc}
-export SHELL=/bin/sh
-%ant javadoc
-%endif
+%ant build-jar %{?with_javadoc:javadoc}
+%ant -f tomcat5-build.xml
%install
rm -rf $RPM_BUILD_ROOT
@@ -128,6 +130,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.30 2009/05/18 10:16:10 pawelz
+- JDK bconds
+- simplified (removed SHELL=/bin/sh and -Dbuild.compiler hacks)
+
Revision 1.29 2009/02/16 07:47:40 pawelz
- use java-gcj-compat-devel
- do not R jre
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-pool/java-commons-pool.spec?r1=1.29&r2=1.30&f=u
More information about the pld-cvs-commit
mailing list