[X2Go-Commits] [pyhoca-gui] 01/01: Make sure that with Python3 builds, the pyhoca.wxgui module gets picked up from the build's Python3 location.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository pyhoca-gui.

commit 71f7b5e6a533c8a86c548d4ba0142feca5a197ff
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 11 12:47:59 2019 +0100

    Make sure that with Python3 builds, the pyhoca.wxgui module gets picked up from the build's Python3 location.
---
 debian/changelog | 6 ++++--
 pyhoca-gui.spec  | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 27a3863..c07010d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pyhoca-gui (0.6.0.0-0x2go1) UNRELEASED; urgency=medium
+pyhoca-gui (0.6.0.0-0x2go2) UNRELEASED; urgency=medium
 
   * New upstream version (0.6.0.0):
     - PyHocaGUI.OnExit(): Return an exitcode.
@@ -23,8 +23,10 @@ pyhoca-gui (0.6.0.0-0x2go1) UNRELEASED; urgency=medium
       of Python3.
   * pyhoca-gui.spec:
     + Support building against Python3 (for Fedora and RHEL >= 8).
+    + Make sure that with Python3 builds, the pyhoca.wxgui module gets picked up
+      from the build's Python3 location.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 02 Dec 2019 17:10:19 +0100
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 11 Dec 2019 12:47:21 +0100
 
 pyhoca-gui (0.5.1.0-0x2go1) unstable; urgency=medium
 
diff --git a/pyhoca-gui.spec b/pyhoca-gui.spec
index f2dd1af..a87354e 100644
--- a/pyhoca-gui.spec
+++ b/pyhoca-gui.spec
@@ -163,9 +163,14 @@ fi
 %{python_sitelib}/pyhoca/
 %endif
 %else
+%if 0%{?fedora} || 0%{?rhel} >= 8
+%{python3_sitelib}/PyHoca_GUI*
+%{python3_sitelib}/pyhoca/
+%else
 %{python2_sitelib}/PyHoca_GUI*
 %{python2_sitelib}/pyhoca/
 %endif
+%endif
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/PyHoca/
 %{_datadir}/pixmaps/pyhoca_x2go-logo-ubuntu.svg

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git