RPM: more updates related to python3

Signed-off-by: François Andriot <albator78@libertysurf.fr>

2 files changed, 69 insertions, 2 deletions

diff --git a/redhat/applications/office/tellico/tellico.spec b/redhat/applications/office/tellico/tellico.spec
index 42cce3c06..ee92c8f4b 100644
--- a/redhat/applications/office/tellico/tellico.spec
+++ b/redhat/applications/office/tellico/tellico.spec
@@ -220,7 +220,14 @@ documentation.
 %{tde_datadir}/apps/tellico/*.xml
 %{tde_datadir}/apps/tellico/*.png
 %{tde_datadir}/apps/tellico/entry-templates
+%if 0%{?rhel} == 7 || 0%{?suse_version}
 %{tde_datadir}/apps/tellico/*.py*
+%if 0%{?rhel} == 7
+%{tde_datadir}/apps/tellico/__pycache__/
+%endif
+%else
+%pycached %{tde_datadir}/apps/tellico/*.py
+%endif
 %{tde_datadir}/apps/tellico/pics
 %{tde_datadir}/apps/tellico/report-templates
 %{tde_datadir}/apps/tellico/tellico.dtd
@@ -239,7 +246,6 @@ documentation.
 %{tde_datadir}/apps/tdeconf_update/tellico-1-3-update.pl
 %{tde_datadir}/apps/tdeconf_update/tellico-rename.upd
 %{tde_datadir}/apps/tdeconf_update/tellico.upd
-%{tde_datadir}/apps/tellico/__pycache__/
 
 ##########
 
diff --git a/redhat/applications/settings/tde-guidance/tde-guidance.spec b/redhat/applications/settings/tde-guidance/tde-guidance.spec
index 7fdabcd06..b047f3226 100644
--- a/redhat/applications/settings/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/settings/tde-guidance/tde-guidance.spec
@@ -190,6 +190,7 @@ or can be run as standalone applications.
 %{tde_datadir}/apps/guidance/
 %{tde_tdeappdir}/*.desktop
 %{tde_datadir}/icons/crystalsvg/*/*/*.png
+%if 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/%{name}/SMBShareSelectDialog.py*
 %{python_sitearch}/%{name}/SimpleCommandRunner.py*
 %{python_sitearch}/%{name}/fuser.py*
@@ -201,8 +202,33 @@ or can be run as standalone applications.
 %{python_sitearch}/%{name}/unixauthdb.py*
 %{python_sitearch}/%{name}/userconfig.py*
 %{python_sitearch}/%{name}/wineconfig.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/%{name}/__pycache__/SMBShareSelectDialog.*.pyc
+%{python_sitearch}/%{name}/__pycache__/SimpleCommandRunner.*.pyc
+%{python_sitearch}/%{name}/__pycache__/fuser.*.pyc
+%{python_sitearch}/%{name}/__pycache__/fuser_ui.*.pyc
+%{python_sitearch}/%{name}/__pycache__/grubconfig.*.pyc
+%{python_sitearch}/%{name}/__pycache__/mountconfig.*.pyc
+%{python_sitearch}/%{name}/__pycache__/serviceconfig.*.pyc
+%{python_sitearch}/%{name}/__pycache__/sizeview.*.pyc
+%{python_sitearch}/%{name}/__pycache__/unixauthdb.*.pyc
+%{python_sitearch}/%{name}/__pycache__/userconfig.*.pyc
+%{python_sitearch}/%{name}/__pycache__/wineconfig.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/%{name}/SMBShareSelectDialog.py
+%pycached %{python_sitearch}/%{name}/SimpleCommandRunner.py
+%pycached %{python_sitearch}/%{name}/fuser.py
+%pycached %{python_sitearch}/%{name}/fuser_ui.py
+%pycached %{python_sitearch}/%{name}/grubconfig.py
+%pycached %{python_sitearch}/%{name}/mountconfig.py
+%pycached %{python_sitearch}/%{name}/serviceconfig.py
+%pycached %{python_sitearch}/%{name}/sizeview.py
+%pycached %{python_sitearch}/%{name}/unixauthdb.py
+%pycached %{python_sitearch}/%{name}/userconfig.py
+%pycached %{python_sitearch}/%{name}/wineconfig.py
+%endif
 %{tde_tdedocdir}/HTML/en/guidance/
-%{python_sitearch}/%{name}/__pycache__/
 
 # Files from powermanager
 %if 0%{?with_powermanager}
@@ -232,11 +258,26 @@ Guidance configuration tools.
 %files backends
 %defattr(-,root,root,-)
 %dir %{python_sitearch}/%{name}
+%if 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/%{name}/MicroHAL.py*
 %{python_sitearch}/%{name}/drivedetect.py*
 %{python_sitearch}/%{name}/wineread.py*
 %{python_sitearch}/%{name}/winewrite.py*
 %{python_sitearch}/%{name}/xf86misc.py*
+%if 0%{?rhel} == 7
+%{python_sitearch}/%{name}/__pycache__/MicroHAL.*.pyc
+%{python_sitearch}/%{name}/__pycache__/drivedetect.*.pyc
+%{python_sitearch}/%{name}/__pycache__/wineread.*.pyc
+%{python_sitearch}/%{name}/__pycache__/winewrite.*.pyc
+%{python_sitearch}/%{name}/__pycache__/xf86misc.*.pyc
+%endif
+%else
+%pycached %{python_sitearch}/%{name}/MicroHAL.py
+%pycached %{python_sitearch}/%{name}/drivedetect.py
+%pycached %{python_sitearch}/%{name}/wineread.py
+%pycached %{python_sitearch}/%{name}/winewrite.py
+%pycached %{python_sitearch}/%{name}/xf86misc.py
+%endif
 %{python_sitearch}/ixf86misc*.so
 %{python_sitearch}/xf86misc*.pyc
 
@@ -265,6 +306,7 @@ suspend using HAL.
 %files powermanager
 %defattr(-,root,root,-)
 %{tde_bindir}/guidance-power-manager
+%if 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/%{name}/MicroHAL.py*
 %{python_sitearch}/%{name}/guidance-power-manager.py*
 %{python_sitearch}/%{name}/powermanage.py*
@@ -273,6 +315,24 @@ suspend using HAL.
 %{python_sitearch}/%{name}/guidance_power_manager_ui.py*
 %{python_sitearch}/%{name}/notify.py*
 %{python_sitearch}/%{name}/tooltip.py*
+%{python_sitearch}/%{name}/__pycache__/MicroHAL.*.pyc
+%{python_sitearch}/%{name}/__pycache__/guidance-power-manager.*.pyc
+%{python_sitearch}/%{name}/__pycache__/powermanage.*.pyc
+%{python_sitearch}/%{name}/__pycache__/gpmhelper.*.pyc
+%{python_sitearch}/%{name}/__pycache__/powermanager_ui.*.pyc
+%{python_sitearch}/%{name}/__pycache__/guidance_power_manager_ui.*.pyc
+%{python_sitearch}/%{name}/__pycache__/notify.*.pyc
+%{python_sitearch}/%{name}/__pycache__/tooltip.*.pyc
+%else
+%pycached %{python_sitearch}/%{name}/MicroHAL.py
+%pycached %{python_sitearch}/%{name}/guidance-power-manager.py
+%pycached %{python_sitearch}/%{name}/powermanage.py
+%pycached %{python_sitearch}/%{name}/gpmhelper.py
+%pycached %{python_sitearch}/%{name}/powermanager_ui.py
+%pycached %{python_sitearch}/%{name}/guidance_power_manager_ui.py
+%pycached %{python_sitearch}/%{name}/notify.py
+%pycached %{python_sitearch}/%{name}/tooltip.py
+%endif
 %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png
 %{tde_datadir}/apps/guidance/pics/ac-adapter.png
 %{tde_datadir}/apps/guidance/pics/battery*.png
@@ -446,6 +506,7 @@ done
 # Removes useless files
 find %{buildroot} -name "*.egg-info" -exec rm -f {} \;
 find %{buildroot}%{tde_libdir} -name "*.a" -exec rm -f {} \;
+%__rm -rf %{buildroot}%{tde_libdir}/python*/site-packages/guidance-*.egg-info/
 
 
 %clean