[axis2] Fix a bug with generated headers (AXIS2-5349)

[Andy Grimm]

commit 6ccb535036437e7f378b08f5601d0b19a5e7a1f1
Author: Andy Grimm <agrimm at gmail.com>
Date:   Thu Jun 21 13:32:28 2012 -0400

    Fix a bug with generated headers (AXIS2-5349)

 axis2-AXIS2-5349.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 axis2.spec             |    8 +++++++-
 2 files changed, 50 insertions(+), 1 deletions(-)
---
diff --git a/axis2-AXIS2-5349.patch b/axis2-AXIS2-5349.patch
new file mode 100644
index 0000000..60c197c
--- /dev/null
+++ b/axis2-AXIS2-5349.patch
@@ -0,0 +1,43 @@
+Index: modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl
+===================================================================
+--- modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl	(revision 1171177)
++++ modules/codegen/src/org/apache/axis2/wsdl/template/c/StubHeaderTemplate.xsl	(working copy)
+@@ -39,6 +39,9 @@
+         * by the Apache Axis2/Java version: #axisVersion# #today#
+         */
+ 
++        #ifndef <xsl:value-of select="$caps_name"/>_H
++        #define <xsl:value-of select="$caps_name"/>_H
++
+         #include &lt;stdio.h&gt;
+         #include &lt;axiom.h&gt;
+         #include &lt;axutil_utils.h&gt;
+@@ -283,5 +286,7 @@
+ 	#ifdef __cplusplus
+ 	}
+ 	#endif
++
++    #endif
+    </xsl:template>
+ </xsl:stylesheet>
+Index: modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl
+===================================================================
+--- modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl	(revision 1171177)
++++ modules/codegen/src/org/apache/axis2/wsdl/template/c/SkelHeaderTemplate.xsl	(working copy)
+@@ -34,6 +34,8 @@
+      * <xsl:value-of select="@name"/> Axis2/C skeleton for the axisService- Header file
+      */
+ 
++    #ifndef <xsl:value-of select="$caps_svc_name"/>_H
++    #define <xsl:value-of select="$caps_svc_name"/>_H
+ 
+ 	#include &lt;axis2_svc_skeleton.h&gt;
+ 	#include &lt;axutil_log_default.h&gt;
+@@ -159,5 +161,7 @@
+ 	#ifdef __cplusplus
+ 	}
+ 	#endif
++
++    #endif
+     </xsl:template>
+  </xsl:stylesheet>
diff --git a/axis2.spec b/axis2.spec
index e3a97af..b6b4d38 100644
--- a/axis2.spec
+++ b/axis2.spec
@@ -1,6 +1,6 @@
 Name:           axis2
 Version:        1.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java-based Web Services / SOAP / WSDL engine
 
 Group:          Development/Libraries
@@ -13,6 +13,8 @@ Patch0:         %{name}-disable-modules.patch
 # 2) Fix javamail dep
 # 3) Remove gmaven code
 Patch1:         %{name}-dep-fixes.patch
+# wrap generated headers with ifndef/define/endif
+Patch2:         %{name}-AXIS2-5349.patch
 BuildArch:      noarch
 
 BuildRequires: java-devel
@@ -64,6 +66,7 @@ API documentation for %{name}.
 %setup -q -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 
 %build
 # Tests currently use an auto-generated ant build xml file which
@@ -104,6 +107,9 @@ cp -rp target/site/api/* %{buildroot}%{_javadocdir}/%{name}
 
 
 %changelog
+* Wed Jun 20 2012 Andy Grimm <agrimm at gmail.com> - 1.6.1-3
+- Fix a bug with generated headers (AXIS2-5349)
+
 * Mon Mar 12 2012 Andy Grimm <agrimm at gmail.com> - 1.6.1-2
 - change tomcat6 requirement to tomcat 7