[Kimchi-devel] [PATCH] [Kimchi] Github #972: spice-html5 dir incorrect

[dhbarboza82 at gmail.com]

From: Daniel Henrique Barboza <danielhb at linux.vnet.ibm.com>

Before this patch, spice_dir was given by:

self.spice_dir = self.add_prefix('ui/spice-html5')

This results in the '/usr/share/wok/ui/spice-html5' dir when
installing Kimchi in an Opensuse Leap system, which is not
where the spice-html5 files are located. This is probably
a remnant of the Kimchi -> WoK transition.

This patch changes it to:

self.spice_dir = os.path.join(self.ui_dir, 'spice-html5')

That will give us '/usr/share/wok/plugins/kimchi/ui/spice-html5'
instead, making spice-html5 work as intended in Opensuse or
any other distro that requires the --with-spice-html5 flag
in autogen.sh.

Signed-off-by: Daniel Henrique Barboza <danielhb at linux.vnet.ibm.com>
---
 config.py.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.py.in b/config.py.in
index e645d5d..937f1ec 100644
--- a/config.py.in
+++ b/config.py.in
@@ -102,7 +102,7 @@ class KimchiPaths(PluginPaths):
                                        'spice-html5/pages/spice_auto.html')
 
         if __with_spice__ == 'yes':
-            self.spice_dir = self.add_prefix('ui/spice-html5')
+            self.spice_dir = os.path.join(self.ui_dir, 'spice-html5')
         elif os.path.exists('@datadir@/spice-html5'):
             self.spice_dir = '@datadir@/spice-html5'
         else:
-- 
2.5.5