[mx4j] - Fix build.

[Alexander Kurtakov]

commit e7c96ebce8016309faf500c811fbc0e9bd06b45e
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Oct 6 13:58:49 2010 +0300

    - Fix build.

 mx4j.spec |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)
---
diff --git a/mx4j.spec b/mx4j.spec
index bcdbabf..8a44f2a 100644
--- a/mx4j.spec
+++ b/mx4j.spec
@@ -32,7 +32,7 @@
 
 Name:           mx4j
 Version:        3.0.1
-Release:        9.11%{?dist}
+Release:        10%{?dist}
 Epoch:          1
 Summary:        Open source implementation of JMX Java API
 License:        ASL 1.1
@@ -47,15 +47,14 @@ Patch3:         mx4j-docbook.patch
 #Patch4:         mx4j-no-poa.patch
 Patch5:         mx4j-caucho-build.patch
 Patch6:         mx4j-no-iiop.patch
-Url:            http://mx4j.sourceforge.net/
+URL:            http://mx4j.sourceforge.net/
 BuildRequires:  jpackage-utils > 0:1.6
 BuildRequires:  ant >= 0:1.6
-BuildRequires:  ant-trax
+BuildRequires:  ant-nodeps
 BuildRequires:  ant-apache-resolver
-BuildRequires:  jaf
 BuildRequires:  javamail >= 0:1.2-5jpp
 BuildRequires:  log4j >= 0:1.2.7
-BuildRequires:  jakarta-commons-logging >= 0:1.0.1
+BuildRequires:  apache-commons-logging >= 0:1.0.1
 BuildRequires:  xml-commons-apis
 BuildRequires:  bcel >= 0:5.0
 BuildRequires:  jsse >= 0:1.0.2-6jpp
@@ -65,7 +64,7 @@ BuildRequires:  xjavadoc
 BuildRequires:  xdoclet
 BuildRequires:  axis >= 0:1.1
 BuildRequires:  wsdl4j
-BuildRequires:  jakarta-commons-discovery
+BuildRequires:  apache-commons-discovery
 BuildRequires:  docbook-dtds >= 0:1.0
 BuildRequires:  docbook-style-xsl >= 0:1.61
 BuildRequires:  xml-commons-resolver
@@ -87,7 +86,7 @@ Requires(postun):       %{_sbindir}/update-alternatives
 Requires:       jaf
 Requires:       javamail >= 0:1.2-5jpp
 Requires:       log4j >= 0:1.2.7
-Requires:       jakarta-commons-logging >= 0:1.0.1
+Requires:       apache-commons-logging >= 0:1.0.1
 Requires:       xml-commons-apis
 Requires:       bcel >= 0:5.0
 Requires:       jsse >= 0:1.0.2-6jpp
@@ -95,7 +94,7 @@ Requires:       jce >= 0:1.2.2
 Requires:       axis >= 0:1.1
 Requires:       xml-commons-resolver
 Requires:       xml-commons
-Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
+BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
 
 %description
 OpenJMX is an open source implementation of the
@@ -152,15 +151,13 @@ pushd lib
    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 servlet25) servlet.jar
 #   ln -sf $(build-classpath jython) .
    ln -sf $(build-classpath jsse) .
    ln -sf $(build-classpath jsse/jcert) jcert.jar
    ln -sf $(build-classpath jsse/jnet) jnet.jar
    ln -sf $(build-classpath jaas) .
-   ln -sf $(build-classpath javamail/mailapi) .
-   ln -sf $(build-classpath javamail/smtp) .
-   ln -sf $(build-classpath jaf) .
+   ln -sf $(build-classpath javamail/mail) .
    ln -sf $(build-classpath xml-commons-resolver) .
    ln -sf $(build-classpath xdoclet/xdoclet) .
    ln -sf $(build-classpath xdoclet/xdoclet-jmx-module) .
@@ -169,7 +166,7 @@ popd
 
 %build
 
-export OPT_JAR_LIST="ant/ant-junit junit xmlunit ant/ant-trax jaxp_transform_impl ant/ant-apache-resolver xml-commons-resolver"
+export OPT_JAR_LIST="ant/ant-junit junit xmlunit ant/ant-nodeps jaxp_transform_impl ant/ant-apache-resolver xml-commons-resolver xalan-j2-serializer"
 
 cd build
 %if %{with_tests}
@@ -220,21 +217,24 @@ if [ "$1" = "0" ]; then
 fi
 
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %{_javadir}/%{name}
 %doc LICENSE.txt
 %doc README.txt
 
 %files javadoc
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %files manual
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc dist/docs/*
 
 %changelog
+* Wed Oct 6 2010 Alexander Kurtakov <akurtako at redhat.com> 1:3.0.1-10
+- Fix build.
+
 * Fri Jan 08 2010 Andrew Overholt <overholt at redhat.com> 1:3.0.1-9.11
 - Add dos2unix BR.
 
@@ -462,5 +462,3 @@ fi
 
 * Fri Jan 18 2002 Henri Gomez <hgomez at users.sourceforge.net> 1.0b1-1jpp
 - first JPackage release
-
-