Author: paszczus Date: Tue Mar 31 12:58:04 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- it can also be build with java-sun so bcond java_sun added
- rel 6
---- Files affected:
SPECS:
java-xml-commons.spec (1.27 -> 1.28)
---- Diffs:
================================================================
Index: SPECS/java-xml-commons.spec
diff -u SPECS/java-xml-commons.spec:1.27 SPECS/java-xml-commons.spec:1.28
--- SPECS/java-xml-commons.spec:1.27 Mon Feb 2 13:28:36 2009
+++ SPECS/java-xml-commons.spec Tue Mar 31 14:57:59 2009
@@ -1,8 +1,17 @@
# $Revision$, $Date$
+#
+# Conditional build:
+%if "%{pld_release}" == "ti"
+%bcond_without java_sun # build with gcj
+%else
+%bcond_with java_sun # build with java-sun
+%endif
+#
%define subver b2
-%define rel 5
+%define rel 6
%define srcname xml-commons
%include /usr/lib/rpm/macros.java
+
Summary: Common code for Apache XML projects
Summary(pl.UTF-8): Wspólny kod dla projektów Apache XML
Name: java-%{srcname}
@@ -17,8 +26,10 @@
URL: http://xml.apache.org/commons/
# ant >= 1.7.1-3 is required because of ant-gcjtask.patch
BuildRequires: ant >= 1.7.1-3
-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
BuildRequires: sed >= 4.0
@@ -70,7 +81,7 @@
%build
%ant clean
-%ant -Dbuild.compiler=gcj jars
+%ant jars
%install
rm -rf $RPM_BUILD_ROOT
@@ -109,6 +120,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.28 2009/03/31 12:57:59 paszczus
+- it can also be build with java-sun so bcond java_sun added
+- rel 6
+
Revision 1.27 2009/02/02 12:28:36 glen
- Libraries/Java group
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-xml-commons.spec?r1=1.27&r2=1.28&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
