[konkretcmpi] Disable check in MOF that fails with current (experimental) cim-schema

[Radek Novacek]

commit b5ab255f17b2caed8134224f93b2cb4374fc5dd2
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Mon Aug 6 08:42:11 2012 +0200

    Disable check in MOF that fails with current (experimental) cim-schema

 konkretcmpi-0.8.7-fix-for-current-schema.patch |   20 ++++++++++++++++++++
 konkretcmpi.spec                               |    8 +++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/konkretcmpi-0.8.7-fix-for-current-schema.patch b/konkretcmpi-0.8.7-fix-for-current-schema.patch
new file mode 100644
index 0000000..5d305a6
--- /dev/null
+++ b/konkretcmpi-0.8.7-fix-for-current-schema.patch
@@ -0,0 +1,20 @@
+diff -up konkretcmpi-0.8.7/src/mof/MOF_Class_Decl.cpp.fix-for-current-schema konkretcmpi-0.8.7/src/mof/MOF_Class_Decl.cpp
+--- konkretcmpi-0.8.7/src/mof/MOF_Class_Decl.cpp.fix-for-current-schema	2012-08-06 08:36:40.213804650 +0200
++++ konkretcmpi-0.8.7/src/mof/MOF_Class_Decl.cpp	2012-08-06 08:38:00.149715300 +0200
+@@ -793,6 +793,8 @@ void MOF_Class_Decl::validate()
+      * Disallow key definitions if any ancestor has already defined a key.
+      */
+ 
++// This condition always fails with latest (experimental) cim-schema
++#if 0
+     if (super_class)
+     {
+         size_t n1 = super_class->count_keys();
+@@ -805,6 +807,7 @@ void MOF_Class_Decl::validate()
+             return;
+         }
+     }
++#endif
+ 
+ #if 0
+     // Track average number of features.
diff --git a/konkretcmpi.spec b/konkretcmpi.spec
index 82dc4fe..8373cc0 100644
--- a/konkretcmpi.spec
+++ b/konkretcmpi.spec
@@ -1,6 +1,6 @@
 Name:           konkretcmpi
 Version:        0.8.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Tool for rapid CMPI providers development
 
 License:        MIT
@@ -13,6 +13,8 @@ Patch0:         konkretcmpi-0.8.7-unistd.patch
 Patch1:         konkretcmpi-0.8.7-fix-assert.patch
 # Create library as shared instead of static
 Patch2:         konkretcmpi-0.8.7-shared-lib.patch
+# Disable check in MOF that fails with current (experimental) cim-schema
+Patch3:         konkretcmpi-0.8.7-fix-for-current-schema.patch
 
 BuildRequires:  sblim-cmpi-devel
 
@@ -34,6 +36,7 @@ This package provides required files for development using konkretcmpi.
 %patch0 -p1 -b .unistd
 %patch1 -p1 -b .fix-assert
 %patch2 -p1 -b .shared-lib
+%patch3 -p1 -b .fix-for-current-schema
 
 %build
 %configure --enable-static=no
@@ -63,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT/usr/lib*/libkonkret.la
 
 
 %changelog
+* Mon Aug 06 2012 Radek Novacek <rnovacek at redhat.com> 0.8.7-5
+- Disable check in MOF that fails with current (experimental) cim-schema
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild