rpms/mx4j/devel mx4j.spec,1.24,1.25

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29611

Modified Files:
	mx4j.spec 
Log Message:
Remove disabled bits now that we ship axis, xdoclet, jacorb and jonathan-rmi


Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mx4j.spec	31 May 2005 15:11:49 -0000	1.24
+++ mx4j.spec	20 Jun 2005 10:46:38 -0000	1.25
@@ -18,11 +18,11 @@
 Patch3:         mx4j-docbook.patch
 Patch4:         mx4j-docbook-style.patch
 Patch5:         mx4j-redhat-build.patch
-Patch6:		mx4j-bz158968.patch
+Patch6:         mx4j-bz158968.patch
 Url:            http://mx4j.sourceforge.net/
 BuildRequires:  jpackage-utils > 0:1.5
 BuildRequires:  ant >= 0:1.6
-BuildRequires:  ant-trax
+BuildRequires:  ant-trax, ant-junit
 BuildRequires:	jaf
 BuildRequires:	javamail >= 0:1.2-5jpp
 BuildRequires:	log4j >= 0:1.2.7
@@ -33,10 +33,17 @@
 BuildRequires:	jce
 BuildRequires:	junit >= 0:3.7.1
 BuildRequires:  coreutils
+BuildRequires:  xjavadoc
+BuildRequires:  xdoclet
+BuildRequires:  axis >= 0:1.1
+BuildRequires:  wsdl4j
+BuildRequires:	jakarta-commons-discovery
 BuildRequires:  docbook-dtds >= 1.0
 BuildRequires:  docbook-style-xsl >= 1.61
 BuildRequires:  xml-commons-resolver
 BuildRequires:  xml-commons
+BuildRequires:  jacorb
+BuildRequires:  jonathan-rmi
 Requires:       /usr/sbin/update-alternatives
 Requires:	jaf
 Requires:	javamail >= 0:1.2-5jpp
@@ -46,7 +53,7 @@
 Requires:  	bcel >= 0:5.0
 Requires:	jsse
 Requires:	jce
-Requires:	junit >= 0:3.7.1
+Requires:  	axis >= 0:1.1
 Requires:  	xml-commons-resolver
 Requires:  	xml-commons
 Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
@@ -87,6 +94,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 cp %{SOURCE1} build
 cp %{SOURCE2} build
@@ -99,25 +107,16 @@
    ln -sf $(build-classpath commons-logging) .
    ln -sf $(build-classpath log4j) .
    ln -sf $(build-classpath bcel) .
+   ln -sf $(build-classpath axis/axis) .
+   ln -sf $(build-classpath axis/jaxrpc) .
+   ln -sf $(build-classpath axis/saaj) .
+   ln -sf $(build-classpath wsdl4j) .
+   ln -sf $(build-classpath commons-discovery) .
    ln -sf $(build-classpath servletapi5) servlet.jar
    ln -sf $(build-classpath jsse) .
    ln -sf $(build-classpath jaas) .
 popd
 
-# libgcj has no javax.rmi or org.omg classes (#158968).
-if java -version 2>&1 | grep -q "gcj"; then
-%patch6 -p1
-  rm -f src/core/javax/management/remote/rmi/RMIIIOPServerImpl.java
-  rm -f src/core/mx4j/remote/resolver/iiop/IIOPResolver.java
-  rm -f src/tools/mx4j/tools/adaptor/rmi/iiop/IIOPAdaptor.java
-  rm -f src/tools/mx4j/tools/connector/rmi/iiop/*
-fi
-# Fedora doesn't have axis.
-rm -f src/tools/mx4j/tools/remote/resolver/soap/SOAPResolver.java
-find src/tools/mx4j/tools/remote/soap -type f | xargs rm -f
-rm -f src/tools/mx4j/tools/remote/provider/soap/ClientProvider.java
-rm -f src/tools/mx4j/tools/remote/provider/soap/ServerProvider.java
-
 %build
 export ANT_OPTS="-Djava.security.manager -Djava.security.policy=$(pwd)/build/mx4j-build.policy"
 export CLASSPATH=$(build-classpath activation javamail/mailapi javamail/smtp \
@@ -125,6 +124,7 @@
    log4j jaxp_transform_impl axis/axis axis/jaxrpc axis/saaj \
    xml-commons-resolver xdoclet/xdoclet xdoclet/xdoclet-jmx-module \
    xdoclet/xdoclet-mx4j-module)
+export CLASSPATH=$(build-classpath jacorb/jacorb jonathan-rmi):$CLASSPATH
 
 export CLASSPATH=${CLASSPATH}:%{_builddir}/%{name}-%{version}/classes/core:%{_builddir}/%{name}-%{version}/build
 
@@ -210,6 +210,11 @@
 %doc dist/docs/*
 
 %changelog
+* Mon Jun 20 2005 Gary Benson <gbenson at redhat.com>
+- Add missing build dependency on ant-junit.
+- Build stuff that requires axis and xdoclet now that we ship them.
+- Pick up CORBA and javax.rmi classes from jacorb and jonathan-rmi.
+
 * Fri May 27 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_9fc
 - Rearrange how BC-compiled stuff is built and installed.
 - Add missing epochs to dependencies.