From 9bdc39d530760c7799d5d5fd31074fc8d2ceaf23 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 11 Nov 2020 10:33:25 +0100 Subject: [PATCH] no longer buildrequires nor requires pip2 packages this means the tests will need to pip2 install stuff if/as needed --- sfa.spec | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/sfa.spec b/sfa.spec index 220ee007..468effe3 100644 --- a/sfa.spec +++ b/sfa.spec @@ -24,24 +24,20 @@ URL: %{SCMURL} Summary: Server-side for SFA, generic implementation derived from PlanetLab Group: Applications/System BuildRequires: make -%if "%{distro}" == "Fedora" && "%{distrorelease}" <= "29" -BuildRequires: python2-dateutil -BuildRequires: python2-lxml -%endif +# drop this altogether, we now use pip2 +#BuildRequires: python2-dateutil +#BuildRequires: python2-lxml # for uuidgen - used in db password generation Requires: util-linux-ng # for the registry Requires: postgresql >= 8.2, postgresql-server >= 8.2 -# these are no longer supported in f33, use pip2 instead -%if "%{distro}" == "Fedora" && "%{distrorelease}" <= "31" -Requires: python2-pygresql -%endif -Requires: python2-psycopg2 -Requires: python2-sqlalchemy -%if "%{distro}" == "Fedora" && "%{distrorelease}" <= "29" -Requires: python2-migrate -%endif +# drop this altogether, we now use pip2 +#Requires: python2-pygresql +#Requires: python2-psycopg2 +#Requires: python2-sqlalchemy +#Requires: python2-migrate + # and of course the bulk of it Requires: sfa-common @@ -50,17 +46,11 @@ Summary: Python libraries for SFA, generic implementation derived from PlanetLab Group: Applications/System Requires: python Requires: pyOpenSSL -Requires: m2crypto -Requires: python2-dateutil -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: m2crypto +#Requires: python2-dateutil +#Requires: python2-lxml +#Requires: python2-zsi +#Requires: libxslt-python Requires: xmlsec1-openssl-devel %package client -- 2.43.0