[bakefile] - fix for rhbz#633520 and rhbz#652887 (thanks to Jonathan Wakely and Josef Šimánek)

[Filipe Rosset]

commit fd39480c021e1ccebff58d094a81d41252867253
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Sun Jan 2 14:57:30 2011 -0200

    - fix for rhbz#633520 and rhbz#652887 (thanks to Jonathan Wakely and Josef Šimánek)

 bakefile-028-fix-import.patch |   33 +++++++++++++++++++++++++++++++++
 bakefile.spec                 |    8 +++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/bakefile-028-fix-import.patch b/bakefile-028-fix-import.patch
new file mode 100644
index 0000000..c697d48
--- /dev/null
+++ b/bakefile-028-fix-import.patch
@@ -0,0 +1,33 @@
+--- src/writer.py.original	2011-01-02 13:42:00.447184758 -0200
++++ src/writer.py	2011-01-02 14:32:13.299004275 -0200
+@@ -198,20 +198,20 @@
+     return (rulesdir, template)
+ 
+ def invoke_em(writer, file, method):
+-    import empy.em
++    import em
+     rulesdir, template = __findWriter(writer)
+     
+     filename = portautils.mktemp('bakefile')
+     
+-    empy.em.invoke(['-I','mk',
+-                    '-I','writer',
+-                    '-I','utils',
+-                    '-I','os,os.path',
+-                    '-B',
+-                    '-o',filename,
+-                    '-E','globals().update(writer.__preparedMkVars)',
+-                    '-D','RULESDIR="%s"' % rulesdir.replace('\\','\\\\'),
+-                    template])
++    em.invoke(['-I','mk',
++               '-I','writer',
++               '-I','utils',
++               '-I','os,os.path',
++               '-B',
++               '-o',filename,
++               '-E','globals().update(writer.__preparedMkVars)',
++               '-D','RULESDIR="%s"' % rulesdir.replace('\\','\\\\'),
++               template])
+     txt = __readFile(filename)
+     os.remove(filename)
+     writeFile(file, txt, method)
diff --git a/bakefile.spec b/bakefile.spec
index 7d651a9..9d8894c 100644
--- a/bakefile.spec
+++ b/bakefile.spec
@@ -1,11 +1,12 @@
 Name:           bakefile
 Version:        0.2.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A cross-platform, cross-compiler native makefiles generator
 Group:          Development/Tools
 License:        MIT
 URL:            http://www.bakefile.org/
 Source:         http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0:         bakefile-028-fix-import.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-python python-devel
@@ -18,6 +19,7 @@ makefile (autoconf's Makefile.in, Visual C++ project, bcc makefile etc.)
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -46,7 +48,11 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/%{name}/_bkl_c.la
 %{_datadir}/aclocal/*.m4
 
+
 %changelog
+* Sun Jan 02 2011 Filipe Rosset <rosset.filipe at gmail.com> - 0.2.8-5
+- fix for rhbz#633520 and rhbz#652887 (thanks to Jonathan Wakely and Josef Šimánek)
+
 * Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 0.2.8-4
 - recompiling .py files against Python 2.7 (rhbz#623276)