[openerp] Fixing build errors

[leamas]

commit c375510f9a060c2a1d23c3838b32c4b700137495
Author: Alec Leamas <alec at tests.notat.diaspora.com>
Date:   Sun Jan 27 11:32:51 2013 +0100

    Fixing build errors

 openerp.spec |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/openerp.spec b/openerp.spec
index 57677ac..07c97da 100644
--- a/openerp.spec
+++ b/openerp.spec
@@ -25,7 +25,6 @@ Patch1:     openerp-unbundle-pyftpdlib.patch
             # https://bugzilla.redhat.com/show_bug.cgi?id=693425#c57
 Patch10:    openerp-server-relicense-dict_tools-to-LGPL2.1.patch
 
-Requires:   %{name}-mpl = %{version}-%{release}
 Requires:   ghostscript
 Requires:   postgresql-python
 Requires:   pychart
@@ -100,15 +99,6 @@ also find more additions (aka. modules) for this ERP system in:
 http://www.openerp.com/ or  http://apps.openerp.com/
 
 
-%package mpl
-Summary:    MPL-licensed files for openerp
-Requires:   %{name} = %{version}-%{release}
-
-%description mpl
-Some files in the in the openerp distribution have a MPL license and
-must thus be distributed separately in this package.
-
-
 %prep
 %setup -q -n %{oe_src_dir}
 %patch0 -p1
@@ -157,7 +147,7 @@ sed -i "s|%{buildroot}||" %{buildroot}%{_bindir}/openerp-server
 rm  %{buildroot}/usr/openerp/.apidoc
 rm -r  %{buildroot}%{python_sitelib}/openerp
 mv %{buildroot}/usr/openerp %{buildroot}%{python_sitelib}
-rm -r %{buildroot}/usr/localedata
+#rm -r %{buildroot}/usr/localedata
 
 install -m 644 -D install/openerp-server.conf  \
     %{buildroot}%{_sysconfdir}/openerp/openerp-server.conf
@@ -231,17 +221,14 @@ fi
 %dir %{_sysconfdir}/openerp/stop.d
 %attr(0660,root,openerp)  %config(noreplace) %{_sysconfdir}/openerp/openerp-server.conf
 
-%files mpl
-%{python_sitelib}/openerp/addons/wiki/web/controllers/wiki.py*
-%{python_sitelib}/openerp/addons/wiki/web/widgets/wiki.py*
-
-
 
 %changelog
 
 * Sun Jan 27 2013 Alec Leamas <leamas at nowhere.com> 6.1-3
   - Updating to latest snapshot release
   - Drop PyXML dep (#842882)
+  - Remove mpl subpackage (See
+    https://bugs.launchpad.net/openobject-addons/+bug/1049301)
 
 * Wed Sep 12 2012 Alec Leamas <leamas at nowhere.com> 6.1-2
   - Updating to latest nightly