[axis/f17] Changed dependency from axis-wsdl4j to wsdl4j

[Marek Goldmann]

commit a4cf8dc9a87eb18ba50bfef98ab335c5f9bbb22d
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Thu May 24 17:30:50 2012 +0200

    Changed dependency from axis-wsdl4j to wsdl4j

 axis-1.4-wsdl-pom.patch |   22 ++++++++++++++++++++++
 axis.spec               |   12 +++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)
---
diff --git a/axis-1.4-wsdl-pom.patch b/axis-1.4-wsdl-pom.patch
new file mode 100644
index 0000000..774c7d2
--- /dev/null
+++ b/axis-1.4-wsdl-pom.patch
@@ -0,0 +1,22 @@
+--- axis-1.4.pom	2012-05-11 10:48:16.838000514 +0200
++++ axis-1.4-work.pom	2012-05-11 10:49:54.480987651 +0200
+@@ -33,9 +33,9 @@
+          <version>1.4</version>
+       </dependency>
+       <dependency><!-- depends on nothing; I think -->
+-         <groupId>axis</groupId>
+-         <artifactId>axis-wsdl4j</artifactId>
+-         <version>1.5.1</version><!-- version independent of axis -->
++         <groupId>wsdl4j</groupId>
++         <artifactId>wsdl4j</artifactId>
++         <version>1.6.2</version><!-- version independent of axis -->
+          <scope>runtime</scope>
+          <!-- note: also at wsdl4j:wsdl4j (a sf.net project) -->
+       </dependency>
+@@ -53,4 +53,4 @@
+       </dependency>
+       <!-- supposedly also depends on log4j 1.2.8 but that is unlikely given commons-logging -->
+    </dependencies>
+-</project>
+\ No newline at end of file
++</project>
diff --git a/axis.spec b/axis.spec
index 584a321..e3a75db 100644
--- a/axis.spec
+++ b/axis.spec
@@ -1,6 +1,6 @@
 Name:          axis
 Version:       1.4
-Release:       13%{?dist}
+Release:       14%{?dist}
 Epoch:         0
 Summary:       SOAP implementation in Java
 License:       ASL 2.0
@@ -25,6 +25,7 @@ Source7: http://repo1.maven.org/maven2/axis/axis-saaj/1.4/axis-saaj-1.4.pom
 Source8: axis-schema-1.4.pom
 Patch0:        %{name}-java16.patch
 Patch1:        %{name}-manifest.patch
+Patch2:        axis-1.4-wsdl-pom.patch
 BuildRequires: jpackage-utils >= 0:1.6
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: ant >= 0:1.6
@@ -111,7 +112,9 @@ for f in $(find . -name "*.class"); do mv $f $f.no; done
 %patch0 -b .orig
 %patch1 -b .orig
 
-cp %{SOURCE1} %{SOURCE2} %{SOURCE3} .
+cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} .
+
+%patch2 -b .orig
 
 %build
 pushd lib
@@ -181,7 +184,7 @@ install -m 644 build/axis.war \
 
 # POMs
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -m 644 %{S:4} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis.pom
+install -m 644 axis-1.4.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis.pom
 %add_maven_depmap JPP.%{name}-axis.pom %{name}/axis.jar
 install -m 644 %{S:5} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-ant.pom
 %add_maven_depmap JPP.%{name}-axis-ant.pom %{name}/axis-ant.jar
@@ -207,6 +210,9 @@ install -m 644 %{S:8} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-axis-schema.pom
 %doc docs/*
 
 %changelog
+* Fri May 11 2012 Marek Goldmann <mgoldman at redhat.com> 0:1.4-14
+- Changed dependency from axis-wsdl4j to wsdl4j
+
 * Mon Apr 30 2012 Alexander Kurtakov <akurtako at redhat.com> 0:1.4-13
 - Revert RHEL conditionals - we are not getting complete build with them.