more tweaks for f31/py2

diff --git a/Makefile b/Makefile
index 766bc1d..340d9d7 100644 (file)
--- 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 44dfc47..bd374c0 100644 (file)
--- 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