From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 26 Feb 2020 16:05:15 +0000 (+0100)
Subject: more about using python2
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=1dfccf228d06db8b83476a6482e8b47409e8bc54

more about using python2
---

diff --git a/Makefile b/Makefile
index 340d9d7d..e2e36e7e 100644
--- a/Makefile
+++ b/Makefile
@@ -33,8 +33,8 @@ sfa/util/version.py: sfa/util/version.py.in force
 python-install:
 	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
+	rm -rf $(DESTDIR)/usr/lib*/python2*/site-packages/*egg-info
+	rm -rf $(DESTDIR)/usr/lib*/python2*/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
diff --git a/sfa.spec b/sfa.spec
index bd374c0e..79773cbf 100644
--- a/sfa.spec
+++ b/sfa.spec
@@ -4,7 +4,7 @@
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch	%( python2 -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
-%{!?python_sitelib: %define python_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python2_sitelib: %define python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: %{name}
 Version: %{version}
@@ -146,17 +146,17 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/html/wsdl/*.wsdl
 
 %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
+%{python2_sitelib}/sfa/__init__.py*
+%{python2_sitelib}/sfa/trust
+%{python2_sitelib}/sfa/storage
+%{python2_sitelib}/sfa/util
+%{python2_sitelib}/sfa/server
+%{python2_sitelib}/sfa/methods
+%{python2_sitelib}/sfa/generic
+%{python2_sitelib}/sfa/managers
+%{python2_sitelib}/sfa/importer
+%{python2_sitelib}/sfa/rspecs
+%{python2_sitelib}/sfa/client
 
 %files client
 %config (noreplace) /etc/sfa/sfi_config
@@ -171,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files plc
 %defattr(-,root,root)
-%{python_sitelib}/sfa/planetlab
+%{python2_sitelib}/sfa/planetlab
 /etc/sfa/pl.rng
 /etc/sfa/credential.xsd
 /etc/sfa/top.xsd
@@ -181,15 +181,15 @@ rm -rf $RPM_BUILD_ROOT
 /etc/sfa/topology
 
 %files iotlab
-%{python_sitelib}/sfa/iotlab
+%{python2_sitelib}/sfa/iotlab
 
 %files dummy
-%{python_sitelib}/sfa/dummy
+%{python2_sitelib}/sfa/dummy
 
 %files sfatables
 /etc/sfatables/*
 %{_bindir}/sfatables
-%{python_sitelib}/sfatables
+%{python2_sitelib}/sfatables
 
 %files tests
 %{_datadir}/sfa/tests