Author: pawelz Date: Sun Mar 29 15:48:28 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- unified jdk bconds
- dropped "export SHELL=/bin/sh" (no longer needed, fixed in gjdoc.spec)
---- Files affected:
SPECS:
java-commons-io.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: SPECS/java-commons-io.spec
diff -u SPECS/java-commons-io.spec:1.14 SPECS/java-commons-io.spec:1.15
--- SPECS/java-commons-io.spec:1.14 Tue Feb 10 14:03:50 2009
+++ SPECS/java-commons-io.spec Sun Mar 29 17:48:23 2009
@@ -3,6 +3,11 @@
# Conditional build:
%bcond_without javadoc # don't build javadoc
%bcond_with tests # run tests (takes long time)
+%bcond_with java_sun # build with java-sun
+
+%if "%{pld_release}" == "ti"
+%define with_java_sun 1
+%endif
%include /usr/lib/rpm/macros.java
@@ -19,7 +24,8 @@
URL: http://commons.apache.org/io/
BuildRequires: ant
%{?with_tests:BuildRequires: ant-junit >= 1.5}
-BuildRequires: java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
BuildRequires: jpackage-utils
%{?with_tests:BuildRequires: junit >= 3.8.1}
BuildRequires: rpm-javaprov
@@ -60,8 +66,7 @@
%build
# for tests
-export SHELL=/bin/sh
-%ant -Dbuild.compiler=extJavac jar %{?with_javadoc:javadoc}
+%ant jar %{?with_javadoc:javadoc}
%if %{with tests}
JUNITJAR=$(find-jar junit)
@@ -105,6 +110,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2009/03/29 15:48:23 pawelz
+- unified jdk bconds
+- dropped "export SHELL=/bin/sh" (no longer needed, fixed in gjdoc.spec)
+
Revision 1.14 2009/02/10 13:03:50 pawelz
- use %%srcname macro
- correct dir for javadoc
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-io.spec?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
