Author: paszczus Date: Tue Mar 31 13:47:40 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- it can also be build with java-sun so bcond java_sun added
- release 5
---- Files affected:
SPECS:
java-xml-commons-external.spec (1.10 -> 1.11)
---- Diffs:
================================================================
Index: SPECS/java-xml-commons-external.spec
diff -u SPECS/java-xml-commons-external.spec:1.10
SPECS/java-xml-commons-external.spec:1.11
--- SPECS/java-xml-commons-external.spec:1.10 Mon Feb 2 14:32:19 2009
+++ SPECS/java-xml-commons-external.spec Tue Mar 31 15:47:35 2009
@@ -2,14 +2,22 @@
# TODO
# - something with org.apache.env.which (currently xml-commons-which.jar in
# xml-commons), then obsolete xml-commons here
+# Conditional build:
+%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 srcname xml-commons-external
+
Summary: Apache XML Commons External classes
Summary(pl.UTF-8): Klasy Apache XML Commons External
Name: java-xml-commons-external
Version: 1.3.04
-Release: 4
+Release: 5
License: Apache v2.0
Group: Libraries/Java
Source0:
http://www.apache.org/dist/xml/commons/%{srcname}-%{version}-src.tar.gz
@@ -18,8 +26,10 @@
Source1: %{srcname}-build.xml
URL: http://xml.apache.org/commons/
BuildRequires: ant
-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: jpackage-utils
@@ -62,7 +72,7 @@
%build
# default 64m is too low
#export ANT_OPTS="-Xmx128m"
-%ant -Dbuild.compiler=gcj jar javadoc
+%ant jar javadoc
%install
rm -rf $RPM_BUILD_ROOT
@@ -99,6 +109,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.11 2009/03/31 13:47:35 paszczus
+- it can also be build with java-sun so bcond java_sun added
+- release 5
+
Revision 1.10 2009/02/02 13:32:19 pawelz
- P:/O: old spec name
- rel 4 (it has to be rebuilt once again because of broken libmagic :-/)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-xml-commons-external.spec?r1=1.10&r2=1.11&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
