[openerp] Fixing f18 build errors.
leamas
leamas at fedoraproject.org
Wed Sep 12 12:35:15 UTC 2012
commit af4ddab8d5615bc0e5090272aa9d41dd747b03e9
Author: Alec Leamas <alec at tests.notat.diaspora.com>
Date: Wed Sep 12 14:33:03 2012 +0200
Fixing f18 build errors.
openerp.spec | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/openerp.spec b/openerp.spec
index 755a1b9..fccc5c0 100644
--- a/openerp.spec
+++ b/openerp.spec
@@ -25,14 +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
-%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.
-
Requires: %{name}-mpl = %{version}-%{release}
Requires: ghostscript
Requires: postgresql-python
@@ -71,7 +63,12 @@ BuildRequires: libxslt-python
BuildRequires: pygtk2-devel
BuildRequires: python
BuildRequires: python-babel
+%if 0%{?fedora} > 17
+BuildRequires: python-setuptools-devel
+%else
BuildRequires: python-setuptools
+%endif
+
BuildRequires: python2-devel
BuildRequires: systemd-units
@@ -104,6 +101,15 @@ 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
More information about the scm-commits
mailing list