SPECS: axis.spec - more TODO - dependencies - do not link with libgcj when ...

[pawelz]

Author: pawelz                       Date: Wed Mar 18 17:02:23 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- more TODO
- dependencies
- do not link with libgcj when built with sun jdk.

---- Files affected:
SPECS:
   axis.spec (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: SPECS/axis.spec
diff -u SPECS/axis.spec:1.20 SPECS/axis.spec:1.21
--- SPECS/axis.spec:1.20	Wed Mar 18 16:29:10 2009
+++ SPECS/axis.spec	Wed Mar 18 18:02:18 2009
@@ -2,6 +2,8 @@
 # TODO
 #  - castor is needed by axis-1.2.1-0.2jpp.1.noarch
 #  - package axis2, axis is obsolete. see NOTE below.
+#  - build samples
+#  - package war app
 # NOTE
 #  - 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
@@ -13,49 +15,55 @@
 Name:		axis
 Version:	1.4
 Release:	0.1
-License:	Apache Software License
+License:	Apache
 Group:		Development/Languages/Java
 Source0:	http://ws.apache.org/axis/dist/%{archivever}/%{name}-src-%{archivever}.tar.gz
 # Source0-md5:	3dcce3cbd37f52d70ebeb858f90608dc
-Source1:	axis-build.xml
-Patch0:		axis-classpath.patch
-Patch1:		axis-missing_xsd.patch
+Source1:	%{name}-build.xml
+Patch0:		%{name}-classpath.patch
+Patch1:		%{name}-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}
-# Mandatory requires
+# BuildRequires:	jimi
+# BuildRequires:	jms
+BuildRequires:	httpunit
 BuildRequires:	jaf
 BuildRequires:	java-commons-discovery
 BuildRequires:	java-commons-httpclient
 BuildRequires:	java-commons-logging
+BuildRequires:	java-commons-net
+BuildRequires:	java-oro
+BuildRequires:	java-xalan
+BuildRequires:	java-xerces
+BuildRequires:	java-xml-commons
 BuildRequires:	java-xmlbeans
 BuildRequires:	javamail
-BuildRequires:	jaxp_parser_impl
 BuildRequires:	jpackage-utils
+BuildRequires:	jsse
+BuildRequires:	junit
 BuildRequires:	logging-log4j
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	servletapi5
 BuildRequires:	wsdl4j
-# optional requires
-BuildRequires:	castor
-BuildRequires:	httpunit
-BuildRequires:	jakarta-oro
-# BuildRequires:	jimi
-# BuildRequires:	jms
-BuildRequires:	jsse
-BuildRequires:	junit
+Requires:	httpunit
 Requires:	jaf
-Requires:	jakarta-commons-discovery
-Requires:	jakarta-commons-httpclient
-Requires:	jakarta-commons-logging
-Requires:	java
+Requires:	java-commons-discovery
+Requires:	java-commons-httpclient
+Requires:	java-commons-logging
+Requires:	java-commons-net
+Requires:	java-oro
+Requires:	java-xalan
+Requires:	java-xerces
+Requires:	java-xml-commons
+Requires:	java-xmlbeans
 Requires:	javamail
-Requires:	jaxp_parser_impl
-Requires:	logging-log4j
 Requires:	jpackage-utils
-Requires:	log4j
+Requires:	jsse
+Requires:	logging-log4j
+Requires:	servletapi5
 Requires:	wsdl4j
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -149,7 +157,7 @@
 xml_apis_jar=$(find-jar xml-commons-apis)
 xmlParsersAPIs_jar=$(find-jar xerces-j2)
 xmlbeans_jar=$(find-jar xmlbeans)
-libgcj_jar=$(find-jar libgcj)
+%{!?with_java_sun:libgcj_jar=$(find-jar libgcj)}
 
 #httpunit_jar=$(find-jar httpunit)
 #xmlunit_jar=$(find-jar xmlunit)
@@ -179,7 +187,7 @@
 	-Dxml-apis.jar=$xml_apis_jar \
 	-DxmlParsersAPIs.jar=$xmlParsersAPIs_jar \
 	-Dxmlbeans.jar=$xmlbeans_jar \
-	-Dsun.boot.class.path="$libgcj_jar:[-org.w3c.dom/*]"
+	%{!?with_java_sun:-Dsun.boot.class.path="$libgcj_jar:[-org.w3c.dom/*]"}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -231,6 +239,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2009/03/18 17:02:18  pawelz
+- more TODO
+- dependencies
+- do not link with libgcj when built with sun jdk.
+
 Revision 1.20  2009/03/18 15:29:10  pawelz
 - dropped Source1: build.properties
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/axis.spec?r1=1.20&r2=1.21&f=u