rpm macro was still referring to python2

diff --git a/Makefile b/Makefile
index 3a7384b..9c50f12 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)
+       python3 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
+       python3 setup.py clean
 #      rm $(init)
 
 version-clean:
@@ -112,7 +112,7 @@ PYPI_TARBALL_TOPDIR=/build/sfa
 
 # this target is still helpful to produce the readme in html from README.md
 index.zip index.html: README.md
-       python readme.py
+       python3 readme.py
 
 # I need to run this on my mac as my pypi
 # run git pull first as this often comes afet a module-tag

diff --git a/setup.py b/setup.py
index 412b401..49f878a 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -17,8 +17,8 @@ from distutils.core import setup
 
 # check for the correct version of python
 major, minor = sys.version_info [0:2]
-if (major, minor) != (2, 7):
-    print ("Sorry, the SFA package is currently available only with python-2.7")
+if major <= 2:
+    print ("Sorry, this version of SFA package requires python3")
     exit(1)
 
 

diff --git a/sfa.spec b/sfa.spec
index 519e381..fbd366e 100644 (file)
--- a/sfa.spec
+++ b/sfa.spec
@@ -3,8 +3,6 @@
 %define taglevel 0
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
-%global python_sitearch        %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: %{name}
 Version: %{version}
@@ -143,17 +141,18 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/sfa/examples
 
 %files common
-%{python_sitelib}/sfa/__init__.py*
-%{python_sitelib}/sfa/trust
-%{python_sitelib}/sfa/storage
-%{python_sitelib}/sfa/util
-%{python_sitelib}/sfa/server
-%{python_sitelib}/sfa/methods
-%{python_sitelib}/sfa/generic
-%{python_sitelib}/sfa/managers
-%{python_sitelib}/sfa/importer
-%{python_sitelib}/sfa/rspecs
-%{python_sitelib}/sfa/client
+%{python3_sitelib}/sfa/__init__.py*
+%{python3_sitelib}/sfa/__pycache__/__init__*.pyc
+%{python3_sitelib}/sfa/trust
+%{python3_sitelib}/sfa/storage
+%{python3_sitelib}/sfa/util
+%{python3_sitelib}/sfa/server
+%{python3_sitelib}/sfa/methods
+%{python3_sitelib}/sfa/generic
+%{python3_sitelib}/sfa/managers
+%{python3_sitelib}/sfa/importer
+%{python3_sitelib}/sfa/rspecs
+%{python3_sitelib}/sfa/client
 
 %files client
 %config (noreplace) /etc/sfa/sfi_config
@@ -168,7 +167,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files plc
 %defattr(-,root,root)
-%{python_sitelib}/sfa/planetlab
+%{python3_sitelib}/sfa/planetlab
 /etc/sfa/pl.rng
 /etc/sfa/credential.xsd
 /etc/sfa/top.xsd
@@ -178,15 +177,15 @@ rm -rf $RPM_BUILD_ROOT
 /etc/sfa/topology
 
 %files iotlab
-%{python_sitelib}/sfa/iotlab
+%{python3_sitelib}/sfa/iotlab
 
 %files dummy
-%{python_sitelib}/sfa/dummy
+%{python3_sitelib}/sfa/dummy
 
 %files sfatables
 /etc/sfatables/*
 %{_bindir}/sfatables
-%{python_sitelib}/sfatables
+%{python3_sitelib}/sfatables
 
 %files tests
 %{_datadir}/sfa/tests