From 8dcdd5a9caa43c0e1b3db691b6d19bfcf11f6988 Mon Sep 17 00:00:00 2001 From: Li Chaoran Date: Wed, 17 May 2023 09:44:59 +0800 Subject: [PATCH] fix: frontend build failed in openEuler Signed-off-by: Li Chaoran --- frontend/copr-frontend.spec | 53 +++++++++++++++---------------------- 1 file changed, 22 insertions(+), 31 deletions(-) diff --git a/frontend/copr-frontend.spec b/frontend/copr-frontend.spec index c5d3760ef..423d41b31 100644 --- a/frontend/copr-frontend.spec +++ b/frontend/copr-frontend.spec @@ -1,5 +1,5 @@ %bcond_without check -%if 0%{?fedora} < 32 +%if 0%{?fedora} < 32 && !0%{?openEuler} %bcond_without doc %endif @@ -76,7 +76,7 @@ BuildRequires: python3-devel BuildRequires: python3-alembic BuildRequires: python3-anytree BuildRequires: python3-click -BuildRequires: python3-CommonMark +BuildRequires: python3dist(commonmark) BuildRequires: python3-blinker BuildRequires: python3-beautifulsoup4 BuildRequires: python3-copr-common >= %copr_common_version @@ -85,15 +85,11 @@ BuildRequires: python3-dateutil BuildRequires: python3-decorator BuildRequires: python3-flask BuildRequires: python3-templated-dictionary -%if 0%{?fedora} >= 31 -BuildRequires: python3-flask-caching -%else -BuildRequires: python3-flask-cache -%endif -BuildRequires: python3-flask-openid -BuildRequires: python3-flask-sqlalchemy +BuildRequires: python3dist(flask-caching) +BuildRequires: python3dist(flask-openid) +BuildRequires: python3dist(flask-sqlalchemy) BuildRequires: python3-flask-whooshee -BuildRequires: python3-flask-wtf +BuildRequires: python3dist(flask-wtf) BuildRequires: python3-flask-restx BuildRequires: python3-gobject BuildRequires: python3-html2text @@ -105,23 +101,23 @@ BuildRequires: python3-munch BuildRequires: python3-netaddr BuildRequires: python3-openid-teams BuildRequires: python3-pygments -BuildRequires: python3-pylibravatar +BuildRequires: python3dist(pylibravatar) BuildRequires: python3-pytest BuildRequires: python3-pytz BuildRequires: python3-redis BuildRequires: python3-requests BuildRequires: python3-sphinx BuildRequires: python3-sphinxcontrib-httpdomain -BuildRequires: python3-sqlalchemy-utils +BuildRequires: python3dist(sqlalchemy-utils) BuildRequires: python3-whoosh -BuildRequires: python3-wtforms >= 2.2.1 +BuildRequires: python3dist(wtforms) >= 2.2.1 BuildRequires: python3-ldap BuildRequires: python3-yaml BuildRequires: python3-backoff >= 1.9.0 BuildRequires: python3-pygal BuildRequires: redis BuildRequires: modulemd-tools >= 0.6 -BuildRequires: python3-authlib +BuildRequires: python3dist(authlib) %endif Requires: crontabs @@ -138,23 +134,18 @@ Recommends: fedora-messaging Requires: js-jquery Requires: python3-anytree Requires: python3-click -Requires: python3-CommonMark +Requires: python3dist(commonmark) Requires: python3-alembic Requires: python3-blinker Requires: python3-copr-common >= %copr_common_version Requires: python3-dateutil Requires: python3-email-validator Requires: python3-flask -%if 0%{?fedora} >= 31 -Requires: python3-flask-caching -%else -Requires: python3-flask-cache -%endif -Requires: python3-flask-openid -Requires: python3-flask-sqlalchemy +Requires: python3dist(flask-caching) +Requires: python3dist(flask-openid) +Requires: python3dist(flask-sqlalchemy) Requires: python3-flask-whooshee -Requires: python3-flask-wtf -Requires: python3-flask-wtf +Requires: python3dist(flask-wtf) Requires: python3-flask-restx Requires: python3-gobject Requires: python3-html2text @@ -168,23 +159,23 @@ Requires: python3-netaddr Requires: python3-openid-teams Requires: python3-psycopg2 Requires: python3-pygments -Requires: python3-pylibravatar +Requires: python3dist(pylibravatar) Requires: python3-pytz Requires: python3-redis Requires: python3-requests -Requires: python3-sqlalchemy-utils +Requires: python3dist(sqlalchemy-utils) Requires: python3-templated-dictionary -Requires: python3-wtforms >= 2.2.1 +Requires: python3dist(wtforms) >= 2.2.1 Requires: python3-zmq Requires: python3-ldap Requires: python3-backoff >= 1.9.0 Requires: python3-pygal -Requires: xstatic-bootstrap-scss-common -Requires: xstatic-datatables-common +Requires: python3dist(xstatic-bootstrap-scss) +Requires: python3dist(xstatic-datatables) Requires: js-jquery-ui -Requires: xstatic-patternfly-common +Requires: python3dist(xstatic-patternfly) Requires: modulemd-tools >= 0.6 -Requires: python3-authlib +Requires: python3dist(authlib) Provides: bundled(bootstrap-combobox) = 1.1.6 Provides: bundled(bootstrap-select) = 1.5.4