[X2Go-Commits] [x2goclient] 31/74: Importing all of pyhoca.wxgui in setup.py causes rpmbuild problems due to DISPLAY not being set. It is overkill as well, causing extra dependencies to be installed at build time. (Fixes: #91).

[git-admin at x2go.org]

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

x2go pushed a commit to annotated tag 0.5.0.1
in repository x2goclient.

commit a13a51e90ea824cf730c66e5c3b4fe24ece82b5b
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Dec 20 08:57:12 2012 +0100

    Importing all of pyhoca.wxgui in setup.py causes rpmbuild problems due to DISPLAY not being set.  It is overkill as well, causing extra dependencies to be installed at build time. (Fixes: #91).
---
 debian/changelog | 5 ++++-
 setup.py         | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 24d58c76..0e4001e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 pyhoca-cli (0.2.1.1-0~x2go1) UNRELEASED; urgency=low
 
+  [ Orion Poplawski ]
   * New upstream version (0.2.1.1):
-    - Continue development...
+    - Importing all of pyhoca.wxgui in setup.py causes rpmbuild problems due
+      to DISPLAY not being set.  It is overkill as well, causing extra
+      dependencies to be installed at build time. (Fixes: #91). 
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 13 Dec 2012 13:33:33 +0100
 
diff --git a/setup.py b/setup.py
index 548553ae..9a6b98d9 100755
--- a/setup.py
+++ b/setup.py
@@ -19,11 +19,15 @@
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 from setuptools import setup, find_packages
-import pyhoca.cli
+
+for line in file(os.path.join('pyhoca', 'cli', '__init__.py')).readlines():
+    if (line.startswith('__VERSION__')):
+        exec(line.strip())
+PROGRAM_VERSION = __VERSION__
 
 setup(
     name = "PyHoca-CLI",
-    version = pyhoca.cli.__VERSION__,
+    version = PROGRAM_VERSION,
     description = "PyHoca-CLI is a cross-platform (Windows, MacOS X, Linux) X2Go client for the command line.",
     license = 'AGPLv3+',
     author = 'Mike Gabriel',

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