packages: java-xml-commons-resolver/java-xml-commons-resolver.spec - droppe...

[pawelz]

Author: pawelz                       Date: Wed Oct 21 22:18:14 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dropped obsolete hacks
- distro dependent jdk bconds

---- Files affected:
packages/java-xml-commons-resolver:
   java-xml-commons-resolver.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/java-xml-commons-resolver/java-xml-commons-resolver.spec
diff -u packages/java-xml-commons-resolver/java-xml-commons-resolver.spec:1.15 packages/java-xml-commons-resolver/java-xml-commons-resolver.spec:1.16
--- packages/java-xml-commons-resolver/java-xml-commons-resolver.spec:1.15	Fri Feb  6 01:28:06 2009
+++ packages/java-xml-commons-resolver/java-xml-commons-resolver.spec	Thu Oct 22 00:18:09 2009
@@ -1,4 +1,9 @@
 # $Revision$, $Date$
+%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-resolver
@@ -13,8 +18,10 @@
 # Source0-md5:	46d52acdb67ba60f0156043f30108766
 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
@@ -51,8 +58,7 @@
 mv resolver.xml build.xml
 
 %build
-export SHELL=/bin/sh
-%ant -Dbuild.compiler=gcj jar javadocs
+%ant jar javadocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -87,6 +93,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2009/10/21 22:18:09  pawelz
+- dropped obsolete hacks
+- distro dependent jdk bconds
+
 Revision 1.15  2009/02/06 00:28:06  pawelz
 - export SHELL=/bin/sh
 - rel 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xml-commons-resolver/java-xml-commons-resolver.spec?r1=1.15&r2=1.16&f=u