From 89b9b64680238194f5f8ead70648c6b895d7632a Mon Sep 17 00:00:00 2001
From: Dhruvik Mevada <dhruvik@techreceptives.com>
Date: Fri, 19 Mar 2021 06:24:23 +0000
Subject: [PATCH] [PATCH] Upstream patch for setup and debian

---
 debian/control          |  3 ++
 setup/package.dfdebian  |  2 +
 setup/package.dffedora  | 96 ++++++++++++++++++++---------------------
 setup/redhat/install.sh |  3 +-
 4 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/debian/control b/debian/control
index ba43dbbb3a..dd73723ad2 100644
--- a/debian/control
+++ b/debian/control
@@ -34,6 +34,7 @@ Depends:
  python3-libsass,
  python3-lxml,
  python3-mako,
+ python3-ofxparse,
  python3-passlib,
  python3-polib,
  python3-psutil,
@@ -42,6 +43,7 @@ Depends:
  python3-pyparsing,
  python3-pypdf2,
  python3-qrcode,
+ python3-renderpm,
  python3-reportlab,
  python3-requests,
  python3-stdnum,
@@ -51,6 +53,7 @@ Depends:
  python3-werkzeug,
  python3-xlsxwriter,
  python3-xlrd,
+ python3-zeep,
 Pre-Depends: ${misc:Pre-Depends}
 Conflicts: tinyerp-server, openerp-server, openerp-web, openerp
 Replaces: tinyerp-server, openerp-server, openerp-web, openerp
diff --git a/setup/package.dfdebian b/setup/package.dfdebian
index a661dd7b3f..f31afe7187 100644
--- a/setup/package.dfdebian
+++ b/setup/package.dfdebian
@@ -44,6 +44,7 @@ RUN apt-get update -qq &&  \
         python3-pyparsing \
         python3-pypdf2 \
         python3-qrcode \
+        python3-renderpm \
         python3-reportlab \
         python3-requests \
         python3-serial \
@@ -55,6 +56,7 @@ RUN apt-get update -qq &&  \
         python3-vobject \
         python3-werkzeug \
         python3-xlsxwriter \
+        python3-zeep \
         rsync && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/setup/package.dffedora b/setup/package.dffedora
index 9eb99f5a93..2e9af2f726 100644
--- a/setup/package.dffedora
+++ b/setup/package.dffedora
@@ -6,54 +6,54 @@ MAINTAINER FlectraHQ <info@flectrahq.com>
 # Dependencies and postgres
 RUN dnf update -d 0 -e 0 -y && \
 	dnf install -d 0 -e 0 \
-		babel \
-		createrepo \
-		pychart \
-		pyparsing \
-		python3-babel \
-	  python3-decorator \
-	  python3-docutils \
-	  python3-feedparser \
-	  python3-gevent \
-	  python3-greenlet \
-	  python3-html2text \
-	  python3-jinja2 \
-	  python3-lxml \
-	  python3-mako \
-	  python3-markupsafe \
-	  python3-num2words \
-	  python3-ofxparse \
-	  python3-passlib \
-	  python3-pillow \
-	  python3-psutil \
-	  python3-pydot \
-	  python3-pyldap \
-	  python3-pyparsing \
-	  python3-PyPDF2 \
-	  python3-pyserial \
-	  python3-dateutil \
-	  python3-polib \
-	  python3-pytz \
-	  python3-pyusb \
-	  python3-qrcode \
-	  python3-reportlab \
-	  python3-requests \
-	  python3-six \
-	  python3-stdnum \
-	  python3-suds \
-	  python3-vobject \
-	  python3-werkzeug \
-	  python3-xlwt \
-	  python3-xlrd \
-		python3-xlsxwriter \
-		libsass \
-		pytz \
-		postgresql \
-		postgresql-server \
-		postgresql-libs \
-		postgresql-contrib \
-		postgresql-devel \
-		rpmdevtools -y && \
+	babel \
+	createrepo \
+	pychart \
+	pyparsing \
+	python3-babel \
+	python3-decorator \
+	python3-docutils \
+	python3-feedparser \
+	python3-gevent \
+	python3-greenlet \
+	python3-html2text \
+	python3-jinja2 \
+	python3-lxml \
+	python3-mako \
+	python3-markupsafe \
+	python3-num2words \
+	python3-ofxparse \
+	python3-passlib \
+	python3-pillow \
+	python3-psutil \
+	python3-pydot \
+	python3-pyldap \
+	python3-pyparsing \
+	python3-PyPDF2 \
+	python3-pyserial \
+	python3-dateutil \
+	python3-polib \
+	python3-pytz \
+	python3-pyusb \
+	python3-qrcode \
+	python3-reportlab \
+	python3-requests \
+	python3-six \
+	python3-stdnum \
+	python3-suds \
+	python3-vobject \
+	python3-werkzeug \
+	python3-xlwt \
+	python3-xlrd \
+	python3-xlsxwriter \
+	libsass \
+	pytz \
+	postgresql \
+	postgresql-server \
+	postgresql-libs \
+	postgresql-contrib \
+	postgresql-devel \
+	rpmdevtools -y && \
 	dnf clean all
 
 # Postgres configuration
diff --git a/setup/redhat/install.sh b/setup/redhat/install.sh
index b7a7f3eb40..d02f6f28c6 100644
--- a/setup/redhat/install.sh
+++ b/setup/redhat/install.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 set -e
-python3 setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib usr/lib/python3.7/site-packages/
+ABI=$(rpm -q --provides python3 | awk '/abi/ {print $NF}')
+python3 setup.py install --prefix=/usr --root=$RPM_BUILD_ROOT --record=INSTALLED_FILES --install-lib usr/lib/python${ABI}/site-packages/