From f0a508380ca239d895232d06fa522c59f5f882a6 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Fri, 24 May 2013 18:03:09 +0200
Subject: [PATCH] Fix module imports in /usr/bin/mofcomp

---
 pywbem-20130411-mof_compiler-import.patch | 22 ++++++++++++++++++++++
 pywbem.spec                               |  9 ++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pywbem-20130411-mof_compiler-import.patch

diff --git a/pywbem-20130411-mof_compiler-import.patch b/pywbem-20130411-mof_compiler-import.patch
new file mode 100644
index 0000000..845deb6
--- /dev/null
+++ b/pywbem-20130411-mof_compiler-import.patch
@@ -0,0 +1,22 @@
+diff -up pywbem-20130411/mof_compiler.py.bak pywbem-20130411/mof_compiler.py
+--- pywbem-20130411/mof_compiler.py.bak	2009-07-30 00:55:26.000000000 +0200
++++ pywbem-20130411/mof_compiler.py	2013-05-24 17:40:16.684813502 +0200
+@@ -20,12 +20,12 @@
+ 
+ import sys
+ import os
+-import lex
+-import yacc
+-from lex import TOKEN
+-from cim_operations import CIMError, WBEMConnection
+-from cim_obj import *
+-from cim_constants import *
++from pywbem import lex
++from pywbem import yacc
++from pywbem.lex import TOKEN
++from pywbem.cim_operations import CIMError, WBEMConnection
++from pywbem.cim_obj import *
++from pywbem.cim_constants import *
+ from getpass import getpass
+ 
+ _optimize = 1
diff --git a/pywbem.spec b/pywbem.spec
index 1303414..b4a2139 100644
--- a/pywbem.spec
+++ b/pywbem.spec
@@ -4,7 +4,7 @@
 
 Name:           pywbem 
 Version:        0.7.0
-Release:        9.%{revdate}svn%{svnrev}%{?dist}
+Release:        10.%{revdate}svn%{svnrev}%{?dist}
 Summary:        Python WBEM Client and Provider Interface
 Group:          Development/Libraries
 License:        LGPLv2
@@ -19,6 +19,9 @@ BuildArch:      noarch
 Requires:       python-twisted-core
 Requires:       python-twisted-web
 
+# fix module imports in /usr/bin/mofcomp
+Patch0:         pywbem-20130411-mof_compiler-import.patch
+
 %description
 A Python library for making CIM (Common Information Model) operations over HTTP 
 using the WBEM CIM-XML protocol. It is based on the idea that a good WBEM 
@@ -35,6 +38,7 @@ easiest way to write providers on the planet.
 
 %prep
 %setup -q -n %{name}-%{revdate}
+%patch0 -p1 -b .mofcomp-imports
 
 %build
 CFLAGS="%{optflags}" %{__python} setup.py build
@@ -58,6 +62,9 @@ rm -rf %{buildroot}
 %doc README
 
 %changelog
+* Fri May 24 2013 Tomas Bzatek <tbzatek@redhat.com> 0.7.0-10.20130411svn619
+- Fix module imports in /usr/bin/mofcomp
+
 * Thu Apr 11 2013 Jan Safranek <jsafrane@redhat.com> 0.7.0-9.20130411svn619
 - New upstream version.
 - Removed debug 'print' statements.