[openlmi-networking/f19] add patch for the conflicting data types in the autogenerated headers

[Tomas Smetana]

commit 367dd727e1141d44a804c8c9c739f5b903c13bf9
Author: Tomas Smetana <tsmetana at redhat.com>
Date:   Fri Aug 2 17:48:48 2013 +0200

    add patch for the conflicting data types in the autogenerated headers

 openlmi-networking-0.0.9-typeconflict.patch |   28 +++++++++++++++++++++++++++
 openlmi-networking.spec                     |   10 +++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)
---
diff --git a/openlmi-networking-0.0.9-typeconflict.patch b/openlmi-networking-0.0.9-typeconflict.patch
new file mode 100644
index 0000000..b1da2af
--- /dev/null
+++ b/openlmi-networking-0.0.9-typeconflict.patch
@@ -0,0 +1,28 @@
+diff -up openlmi-networking-0.0.9/src/LMI_IPNetworkConnectionCapabilitiesProvider.c.typeconflict openlmi-networking-0.0.9/src/LMI_IPNetworkConnectionCapabilitiesProvider.c
+--- openlmi-networking-0.0.9/src/LMI_IPNetworkConnectionCapabilitiesProvider.c.typeconflict	2013-08-02 17:43:19.531982428 +0200
++++ openlmi-networking-0.0.9/src/LMI_IPNetworkConnectionCapabilitiesProvider.c	2013-08-02 17:44:04.133775112 +0200
+@@ -195,8 +195,8 @@ KUint16 LMI_IPNetworkConnectionCapabilit
+     CMPIMethodMI* mi,
+     const CMPIContext* context,
+     const LMI_IPNetworkConnectionCapabilitiesRef* self,
+-    const KStringA* TemplateGoalSettings,
+-    KStringA* SupportedGoalSettings,
++    const KInstanceA* TemplateGoalSettings,
++    KInstanceA* SupportedGoalSettings,
+     CMPIStatus* status)
+ {
+     KUint16 result = KUINT16_INIT;
+diff -up openlmi-networking-0.0.9/src/LMI_NetworkEnabledLogicalElementCapabilitiesProvider.c.typeconflict openlmi-networking-0.0.9/src/LMI_NetworkEnabledLogicalElementCapabilitiesProvider.c
+--- openlmi-networking-0.0.9/src/LMI_NetworkEnabledLogicalElementCapabilitiesProvider.c.typeconflict	2013-08-02 17:43:42.106877496 +0200
++++ openlmi-networking-0.0.9/src/LMI_NetworkEnabledLogicalElementCapabilitiesProvider.c	2013-08-02 17:44:30.958650427 +0200
+@@ -187,8 +187,8 @@ KUint16 LMI_NetworkEnabledLogicalElement
+     CMPIMethodMI* mi,
+     const CMPIContext* context,
+     const LMI_NetworkEnabledLogicalElementCapabilitiesRef* self,
+-    const KStringA* TemplateGoalSettings,
+-    KStringA* SupportedGoalSettings,
++    const KInstanceA* TemplateGoalSettings,
++    KInstanceA* SupportedGoalSettings,
+     CMPIStatus* status)
+ {
+     KUint16 result = KUINT16_INIT;
diff --git a/openlmi-networking.spec b/openlmi-networking.spec
index 06d2f3e..2474d58 100644
--- a/openlmi-networking.spec
+++ b/openlmi-networking.spec
@@ -1,6 +1,6 @@
 Name:           openlmi-networking
 Version:        0.0.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        CIM providers for network management
 
 License:        LGPLv2+
@@ -10,6 +10,9 @@ Source0:        http://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.
 # Fix compilation error with NetworkManager 0.9.9
 Patch0:         openlmi-networking-0.0.9-fix-for-NM-0.9.9.patch
 
+# Fix confliciting types in the newly autogenerated headers
+Patch1:         openlmi-networking-0.0.9-typeconflict.patch
+
 # Upstream name has been changed from cura-networking to openlmi-networking
 Provides:       cura-networking%{?_isa} = %{version}-%{release}
 Obsoletes:      cura-networking < 0.0.5-1
@@ -41,7 +44,7 @@ Common Information Model (CIM).
 %prep
 %setup -q
 %patch0 -p1
-
+%patch1 -p1
 
 %build
 mkdir -p %{_target_platform}
@@ -95,6 +98,9 @@ fi
 
 
 %changelog
+* Fri Aug 02 2013 Tomas Smetana <tsmetana at redhat.com> 0.0.9-4
+- add patch for the conflicting data types in the autogenerated headers
+
 * Fri Aug 02 2013 Tomas Smetana <tsmetana at redhat.com> 0.0.9-3
 - rebuild for the new konkretcmpi