[wsdl4j] Fix wsdl4j.jar linking to qname.jar; update OSGI Manifest; javadocs

[Alexander Kurtakov]

commit 3375287791224fc13a319c0f7ce73a0e1b230844
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Sat Jun 16 00:05:43 2012 +0300

    Fix wsdl4j.jar linking to qname.jar; update OSGI Manifest; javadocs

 wsdl4j-MANIFEST.MF |   50 +++++++++++++++++++++++++-------------------------
 wsdl4j.spec        |   38 +++++++++++++++++++-------------------
 2 files changed, 44 insertions(+), 44 deletions(-)
---
diff --git a/wsdl4j-MANIFEST.MF b/wsdl4j-MANIFEST.MF
index d7e1fcb..8a2af82 100644
--- a/wsdl4j-MANIFEST.MF
+++ b/wsdl4j-MANIFEST.MF
@@ -1,25 +1,25 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: javax.wsdl
-Specification-Version: 1.2
-Bundle-ManifestVersion: 2
-Specification-Title: JWSDL
-Bundle-Version: 1.5.2.v200806030407
-Bundle-Vendor: %Bundle-Vendor.0
-Implementation-Vendor: IBM
-Ant-Version: Apache Ant 1.6.5
-Bundle-RequiredExecutionEnvironment: J2SE-1.2
-Created-By: 1.4.1 (IBM Corporation)
-Bundle-Localization: plugin
-Bundle-Name: %Bundle-Name.0
-Specification-Vendor: IBM (Java Community Process)
-Implementation-Version: 1.6
-Bundle-ClassPath: .
-Implementation-Title: WSDL4J
-Export-Package: com.ibm.wsdl,com.ibm.wsdl.extensions,com.ibm.wsdl.exte
- nsions.http,com.ibm.wsdl.extensions.mime,com.ibm.wsdl.extensions.sche
- ma,com.ibm.wsdl.extensions.soap,com.ibm.wsdl.extensions.soap12,com.ib
- m.wsdl.factory,com.ibm.wsdl.util,com.ibm.wsdl.util.xml,com.ibm.wsdl.x
- ml,javax.wsdl,javax.wsdl.extensions,javax.wsdl.extensions.http,javax.
- wsdl.extensions.mime,javax.wsdl.extensions.schema,javax.wsdl.extensio
- ns.soap,javax.wsdl.extensions.soap12,javax.wsdl.factory,javax.wsdl.xm
- l
+Manifest-Version: 1.0
+Bundle-SymbolicName: javax.wsdl
+Specification-Version: 1.2
+Bundle-ManifestVersion: 2
+Specification-Title: JWSDL
+Bundle-Version: 1.6.2
+Bundle-Vendor: %Bundle-Vendor.0
+Implementation-Vendor: IBM
+Ant-Version: Apache Ant 1.6.5
+Bundle-RequiredExecutionEnvironment: J2SE-1.2
+Created-By: 1.4.1 (IBM Corporation)
+Bundle-Localization: plugin
+Bundle-Name: %Bundle-Name.0
+Specification-Vendor: IBM (Java Community Process)
+Implementation-Version: 1.6
+Bundle-ClassPath: .
+Implementation-Title: WSDL4J
+Export-Package: com.ibm.wsdl,com.ibm.wsdl.extensions,com.ibm.wsdl.exte
+ nsions.http,com.ibm.wsdl.extensions.mime,com.ibm.wsdl.extensions.sche
+ ma,com.ibm.wsdl.extensions.soap,com.ibm.wsdl.extensions.soap12,com.ib
+ m.wsdl.factory,com.ibm.wsdl.util,com.ibm.wsdl.util.xml,com.ibm.wsdl.x
+ ml,javax.wsdl,javax.wsdl.extensions,javax.wsdl.extensions.http,javax.
+ wsdl.extensions.mime,javax.wsdl.extensions.schema,javax.wsdl.extensio
+ ns.soap,javax.wsdl.extensions.soap12,javax.wsdl.factory,javax.wsdl.xm
+ l
diff --git a/wsdl4j.spec b/wsdl4j.spec
index 08d112e..07b872d 100644
--- a/wsdl4j.spec
+++ b/wsdl4j.spec
@@ -31,15 +31,15 @@
 Summary:        Web Services Description Language Toolkit for Java
 Name:           wsdl4j
 Version:        1.6.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Group:          Development/Libraries
 License:        CPL
 URL:            http://sourceforge.net/projects/wsdl4j
 BuildArch:      noarch
-Source0:        http://downloads.sourceforge.net/project/wsdl4j/WSDL4J/1.6.2/wsdl4j-src-1.6.2.zip
+Source0:        http://downloads.sourceforge.net/project/wsdl4j/WSDL4J/%{version}/wsdl4j-src-%{version}.zip
 Source1:        %{name}-MANIFEST.MF
-Source2:        http://repo1.maven.org/maven2/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.pom
+Source2:        http://repo1.maven.org/maven2/wsdl4j/wsdl4j/%{version}/wsdl4j-%{version}.pom
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires:       java
 Requires:       jpackage-utils
@@ -68,8 +68,6 @@ Javadoc for %{name}.
 ant compile javadocs
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # inject OSGi manifests
 mkdir -p META-INF
 cp -p %{SOURCE1} META-INF/MANIFEST.MF
@@ -79,13 +77,8 @@ zip -u build/lib/%{name}.jar META-INF/MANIFEST.MF
 # jars
 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
-done
+install -m 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 build/lib/qname.jar $RPM_BUILD_ROOT%{_javadir}/qname.jar
 
 # POMs
 install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -93,27 +86,34 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # javadoc
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+
+%pre javadoc
+# workaround for rpm bug
+# can be removed in F<minimal-release-where-change-will-happen>+2
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
 %doc license.html
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc license.html
 %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jun 15 2012 Gerard Ryan <galileo at fedoraproject.org> - 0:1.6.2-5
+- Fix file encoding for wsdl4j-MANIFEST.MF
+- Update Bundle-Version in OSGi manifest
+- Fix installation of jars in specfile
+- Clean up specfile - remove javadoc dir version; remove clean section
+
 * Thu Feb 16 2012 Andy Grimm <agrimm at gmail.com> - 0:1.6.2-4
 - add POM file