Author: pawelz Date: Fri Apr 10 21:47:20 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- standard java BRs
- conditional jdk bconds
- dropped "build-compiler=extJavac" hack (no longer needed)
---- Files affected:
SPECS:
java-portletapi10.spec (1.6 -> 1.7)
---- Diffs:
================================================================
Index: SPECS/java-portletapi10.spec
diff -u SPECS/java-portletapi10.spec:1.6 SPECS/java-portletapi10.spec:1.7
--- SPECS/java-portletapi10.spec:1.6 Fri Apr 10 13:45:36 2009
+++ SPECS/java-portletapi10.spec Fri Apr 10 23:47:15 2009
@@ -4,6 +4,12 @@
%bcond_without javadoc # don't build javadoc
%bcond_with java_sun # build using java-sun
+%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
%define apiver 1.0
@@ -20,6 +26,10 @@
BuildRequires: ant
%{?with_java_sun:BuildRequires: java-sun}
%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+BuildRequires: jpackage-utils
+BuildRequires: rpm >= 4.4.9-56
+BuildRequires: rpm-javaprov
+BuildRequires: rpmbuild(macros) >= 1.300
Requires: jpackage-utils
Provides: portletapi = %{apiver}
Provides: java(portlet) = %{apiver}
@@ -49,7 +59,6 @@
cd api
%ant \
-Dbuild.sysclasspath=only \
- %{!?with_java_sun:-Dbuild.compiler=extJavac} \
jar
%{?with_javadoc:%ant -Dnoget=1 javadoc}
@@ -95,6 +104,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.7 2009/04/10 21:47:15 pawelz
+- standard java BRs
+- conditional jdk bconds
+- dropped "build-compiler=extJavac" hack (no longer needed)
+
Revision 1.6 2009/04/10 11:45:36 pawelz
- rel 3
- fix previous commit log
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-portletapi10.spec?r1=1.6&r2=1.7&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
