packages: java-axis/java-axis.spec - don't force gcj for th - updated deps

[pawelz]

Author: pawelz                       Date: Sun Apr 18 13:49:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't force gcj for th
- updated deps

---- Files affected:
packages/java-axis:
   java-axis.spec (1.27 -> 1.28) 

---- Diffs:

================================================================
Index: packages/java-axis/java-axis.spec
diff -u packages/java-axis/java-axis.spec:1.27 packages/java-axis/java-axis.spec:1.28
--- packages/java-axis/java-axis.spec:1.27	Wed May 20 08:55:46 2009
+++ packages/java-axis/java-axis.spec	Sun Apr 18 15:49:17 2010
@@ -8,12 +8,6 @@
 #  - it won't compile with java 1.6. see:
 #    https://fcp.surfsite.org/modules/newbb/viewtopic.php?topic_id=55862&viewmode=flat&order=ASC&start=20
 
-%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		archivever %(echo %{version} | tr . _)
@@ -31,46 +25,44 @@
 Patch0:		%{srcname}-classpath.patch
 Patch1:		%{srcname}-missing_xsd.patch
 URL:		http://ws.apache.org/axis/
-BuildRequires:	ant >= 1.6
-BuildRequires:	ant-nodeps
-%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires:	java-sun <= 1.5}
 # BuildRequires:	jimi
 # BuildRequires:	jms
-BuildRequires:	jaf
+BuildRequires:	ant >= 1.6
+BuildRequires:	ant-nodeps
+BuildRequires:	java(jaf)
+BuildRequires:	java(javamail)
+BuildRequires:	java(jsse)
 BuildRequires:	java-commons-discovery
 BuildRequires:	java-commons-httpclient
 BuildRequires:	java-commons-logging
 BuildRequires:	java-commons-net
+BuildRequires:	java-junit
+BuildRequires:	java-log4j
 BuildRequires:	java-oro
+BuildRequires:	jdk <= 1.5
 BuildRequires:	java-wsdl4j
 BuildRequires:	java-xalan
 BuildRequires:	java-xerces
 BuildRequires:	java-xml-commons
 BuildRequires:	java-xmlbeans
-BuildRequires:	javamail
 BuildRequires:	jpackage-utils
-BuildRequires:	jsse
-BuildRequires:	java-junit
-BuildRequires:	logging-log4j
-BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	servletapi5
-Requires:	jaf
+Requires:	java(jaf)
+Requires:	java(javamail)
+Requires:	java(jsse)
 Requires:	java-commons-discovery
 Requires:	java-commons-httpclient
 Requires:	java-commons-logging
 Requires:	java-commons-net
+Requires:	java-log4j
 Requires:	java-oro
 Requires:	java-wsdl4j
 Requires:	java-xalan
 Requires:	java-xerces
 Requires:	java-xml-commons
 Requires:	java-xmlbeans
-Requires:	javamail
 Requires:	jpackage-utils
-Requires:	jsse
-Requires:	logging-log4j
 Requires:	servletapi5
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -246,6 +238,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.28  2010/04/18 13:49:17  pawelz
+- don't force gcj for th
+- updated deps
+
 Revision 1.27  2009/05/20 06:55:46  glen
 - release 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-axis/java-axis.spec?r1=1.27&r2=1.28&f=u