packages: java-xml-commons/java-xml-commons.spec - do not force gcj - Relea...

[jajcus]

Author: jajcus                       Date: Sun Apr 18 08:47:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not force gcj
- Release: 7

---- Files affected:
packages/java-xml-commons:
   java-xml-commons.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/java-xml-commons/java-xml-commons.spec
diff -u packages/java-xml-commons/java-xml-commons.spec:1.30 packages/java-xml-commons/java-xml-commons.spec:1.31
--- packages/java-xml-commons/java-xml-commons.spec:1.30	Sat Apr 17 09:44:30 2010
+++ packages/java-xml-commons/java-xml-commons.spec	Sun Apr 18 10:47:41 2010
@@ -1,14 +1,7 @@
 # $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		6
+%define		rel		7
 %define		srcname	xml-commons
 %include	/usr/lib/rpm/macros.java
 
@@ -24,14 +17,8 @@
 Patch0:		%{srcname}.build.patch
 Patch1:		%{srcname}.manifest.patch
 URL:		http://xml.apache.org/commons/
-# ant >= 1.7.1-3 is required because of ant-gcjtask.patch
-%if %{with java_sun}
 BuildRequires:	ant
-BuildRequires:	java-sun
-%else
-BuildRequires:	ant >= 1.7.1-3
 BuildRequires:	jdk
-%endif
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpm-javaprov
@@ -119,6 +106,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2010/04/18 08:47:41  jajcus
+- do not force gcj
+- Release: 7
+
 Revision 1.30  2010/04/17 07:44:30  jajcus
 - do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
 
================================================================

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