Attachment 587467 Details for Bug 826147 – patch: fix jar installation, fix OSGi bundle version, clean up specfile

[patch] patch: fix jar installation, fix OSGi bundle version, clean up specfile

0001-Fix-wsdl4j.jar-linking-to-qname.jar.patch (text/plain), 5.33 KB, created by Gerard Ryan on 2012-05-29 17:28:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gerard Ryan

Created: 2012-05-29 17:28:45 UTC

Size: 5.33 KB

patch

obsolete

>From 6f3c6e904552c25ce0646741dd04b3de0728775f Mon Sep 17 00:00:00 2001
>From: Gerard Ryan <gerard@ryan.lt>
>Date: Tue, 29 May 2012 18:07:51 +0100
>Subject: [PATCH] Fix wsdl4j.jar linking to qname.jar
>
>---
> wsdl4j-MANIFEST.MF |   50 +++++++++++++++++++++++++-------------------------
> wsdl4j.spec        |   32 +++++++++++++-------------------
> 2 files changed, 38 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..9446262 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,7 +68,6 @@ Javadoc for %{name}.
> ant compile javadocs
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
> 
> # inject OSGi manifests
> mkdir -p META-INF
>@@ -79,13 +78,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 +87,27 @@ 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}
> 
>-%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
>+* Tue May 29 2012 Gerard Ryan <galileo@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@gmail.com> - 0:1.6.2-4
> - add POM file
> 
>-- 
>1.7.10.2
>

Actions: View | Diff

Attachments on bug 826147: 587467 | 592121 | 592126 | 592130