From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 9 Nov 2020 19:57:36 +0000 (+0100)
Subject: tweaks for f31/33
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=45d2c95168ec2b0bf0e47590834193fd2d6ef24b;p=sfa.git

tweaks for f31/33
---

diff --git a/sfa.spec b/sfa.spec
index 79773cbf..b760767d 100644
--- a/sfa.spec
+++ b/sfa.spec
@@ -31,10 +31,15 @@ BuildRequires: python2-lxml
 Requires: util-linux-ng
 # for the registry
 Requires: postgresql >= 8.2, postgresql-server >= 8.2
-Requires: postgresql-python
+# these are no longer supported in f33, use pip2 instead
+%if "%{distro}" == "Fedora" && "%{distrorelease}" <= "31"
+Requires: postgresql-python  # is actually an alias for python2-pygresql
+%endif
 Requires: python2-psycopg2
 Requires: python2-sqlalchemy
+%if "%{distro}" == "Fedora" && "%{distrorelease}" <= "29"
 Requires: python2-migrate
+%endif
 # and of course the bulk of it
 Requires: sfa-common
 
@@ -49,8 +54,10 @@ Requires: python2-lxml
 %if "%{distro}" == "Fedora" && "%{distrorelease}" <= "27"
 Requires: python-ZSI
 %else
+%if "%{distro}" == "Fedora" && "%{distrorelease}" <= "29"
 Requires: python2-zsi
 %endif
+%endif
 Requires: libxslt-python
 Requires: xmlsec1-openssl-devel