[wsdl4j] - Update to 1.6.2. - Cleanups to comply with current guidelines more.

[Alexander Kurtakov]

commit c1634c064d717215850f37f906d7296f4a0a975d
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Nov 4 13:36:46 2010 +0200

    - Update to 1.6.2.
    - Cleanups to comply with current guidelines more.

 sources     |    2 +-
 wsdl4j.spec |   42 +++++++++++++++++++++---------------------
 2 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/sources b/sources
index 2041d0b..7382d0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-edaff274e2dce138a1c898f9ee4c18d1  wsdl4j-1.5.2-src-RHCLEAN.tar.gz
+46825152eda7b8674ac62c28736c24d8  wsdl4j-src-1.6.2.zip
diff --git a/wsdl4j.spec b/wsdl4j.spec
index 95c4a48..9c21339 100644
--- a/wsdl4j.spec
+++ b/wsdl4j.spec
@@ -30,46 +30,41 @@
 
 Summary:        Web Services Description Language Toolkit for Java
 Name:           wsdl4j
-Version:        1.5.2
-Release:        8%{?dist}
+Version:        1.6.2
+Release:        1%{?dist}
 Epoch:          0
 Group:          Development/Libraries
 License:        CPL
 URL:            http://sourceforge.net/projects/wsdl4j
 BuildArch:      noarch
-Source0:        wsdl4j-%{version}-src-RHCLEAN.tar.gz
-##cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wsdl4j login
-##cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wsdl4j export -r wsdl4j-1_5_2 wsdl4j
+Source0:        http://downloads.sourceforge.net/project/wsdl4j/WSDL4J/1.6.2/wsdl4j-src-1.6.2.zip
 Source1:        %{name}-MANIFEST.MF
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires:       jaxp_parser_impl, java
+Requires:       java
+Requires:       jpackage-utils
 BuildRequires:  ant, ant-junit, java-devel
-BuildRequires:	jpackage-utils >= 0:1.5
-BuildRequires:	junit
+BuildRequires:  jpackage-utils >= 0:1.5
+BuildRequires:  zip
 
 %description
 The Web Services Description Language for Java Toolkit (WSDL4J) allows the
 creation, representation, and manipulation of WSDL documents describing
-services.  This codebase will eventually serve as a reference implementation
+services.  This code base will eventually serve as a reference implementation
 of the standard created by JSR110.
 
 %package javadoc
 Group:          Documentation
 Summary:        Javadoc for %{name}
-# for /bin/rm and /bin/ln
-Requires(post):   coreutils
-Requires(postun): coreutils
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-1_6_2
 
 %build
-export OPT_JAR_LIST="ant/ant-junit junit"
-[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
-ant -Dbuild.compiler=modern compile test javadocs
+ant compile javadocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,11 +79,11 @@ zip -u build/lib/%{name}.jar META-INF/MANIFEST.MF
 install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
 
 for jar in %{name}.jar qname.jar ; do
-	vjar=$(echo $jar | sed s+.jar+-%{version}.jar+g)
-	install -m 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/$vjar
-	pushd $RPM_BUILD_ROOT%{_javadir}
-	   ln -fs $vjar %{name}.jar
-	popd
+    vjar=$(echo $jar | sed s+.jar+-%{version}.jar+g)
+    install -m 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/$vjar
+    pushd $RPM_BUILD_ROOT%{_javadir}
+        ln -fs $vjar %{name}.jar
+    popd
 done
 
 # javadoc
@@ -106,10 +101,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files javadoc
 %defattr(-,root,root,-)
+%doc license.html
 %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Nov 4 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.6.2-1
+- Update to 1.6.2.
+- Cleanups to comply with current guidelines more.
+
 * Wed Oct 6 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.5.2-8
 - Drop gcj support.
 - Fix groups.