From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 26 Feb 2020 15:55:24 +0000 (+0100)
Subject: more tweaks for f31/py2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=467eebb5fd6fa5ca99cd51022873a3085b840f3f;p=sfa.git

more tweaks for f31/py2
---

diff --git a/Makefile b/Makefile
index 766bc1d6..340d9d7d 100644
--- a/Makefile
+++ b/Makefile
@@ -31,14 +31,14 @@ sfa/util/version.py: sfa/util/version.py.in force
 
 # postinstall steps - various cleanups and tweaks for a nicer rpm
 python-install:
-	python setup.py install --prefix=$(PREFIX) --root=$(DESTDIR)
+	python2 setup.py install --prefix=$(PREFIX) --root=$(DESTDIR)
 	chmod 444 $(DESTDIR)/etc/sfa/default_config.xml
 	rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/*egg-info
 	rm -rf $(DESTDIR)/usr/lib*/python*/site-packages/sfa/storage/migrations
 	(cd $(DESTDIR)/usr/bin ; ln -s sfi.py sfi; ln -s sfascan.py sfascan; ln -s sfaadmin.py sfaadmin)
 
 python-clean: version-clean
-	python setup.py clean
+	python2 setup.py clean
 #	rm $(init)
 
 version-clean:
diff --git a/sfa.spec b/sfa.spec
index 44dfc478..bd374c0e 100644
--- a/sfa.spec
+++ b/sfa.spec
@@ -24,6 +24,8 @@ URL: %{SCMURL}
 Summary: Server-side for SFA, generic implementation derived from PlanetLab
 Group: Applications/System
 BuildRequires: make
+BuildRequires: python2-dateutil
+BuildRequires: python2-lxml
 
 # for uuidgen - used in db password generation
 Requires: util-linux-ng