[Kimchi-devel] [PATCH WOK 2/2] Add OpenSans font family as dependency and expose the .ttf file on server

[Aline Manera]

Signed-off-by: Aline Manera <alinefm at linux.vnet.ibm.com>
---
 contrib/DEBIAN/control.in  |  3 ++-
 contrib/wok.spec.fedora.in |  1 +
 contrib/wok.spec.suse.in   |  1 +
 src/wok/config.py.in       | 18 ++++++++++++++++--
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in
index 5d65bd0..75682bc 100644
--- a/contrib/DEBIAN/control.in
+++ b/contrib/DEBIAN/control.in
@@ -16,7 +16,8 @@ Depends: python-cherrypy3 (>= 3.2.0),
          nginx,
          python-ldap,
          spice-html5,
-         fonts-font-awesome
+         fonts-font-awesome,
+         texlive-fonts-extra
 Build-Depends: libxslt,
                openssl,
                python-lxml
diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in
index e82f946..f6aa041 100644
--- a/contrib/wok.spec.fedora.in
+++ b/contrib/wok.spec.fedora.in
@@ -20,6 +20,7 @@ Requires:	python-lxml
 Requires:	nginx
 Requires:	python-ldap
 Requires:	fontawesome-fonts
+Requires:	open-sans-fonts
 BuildRequires:	libxslt
 BuildRequires:	openssl
 BuildRequires:	python-lxml
diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in
index 0e9117e..58425c5 100644
--- a/contrib/wok.spec.suse.in
+++ b/contrib/wok.spec.suse.in
@@ -21,6 +21,7 @@ Requires:	python-lxml
 Requires:	python-xml
 Requires:	nginx
 Requires:	fontawesome-fonts
+Requires:	google-opensans-fonts
 BuildRequires:	libxslt-tools
 BuildRequires:	openssl
 BuildRequires:	python-lxml
diff --git a/src/wok/config.py.in b/src/wok/config.py.in
index bdc4db5..10cb58c 100644
--- a/src/wok/config.py.in
+++ b/src/wok/config.py.in
@@ -27,13 +27,27 @@ __release__ = "@wokrelease@"
 
 DEFAULT_LOG_LEVEL = "debug"
 
-FONT_FILES = {'fontawesome': ['fontawesome-webfont.ttf']}
+FONT_FILES = {'fontawesome': ['fontawesome-webfont.ttf'],
+              'opensans': ['OpenSans-ExtraBoldItalic.ttf',
+                           'OpenSans-ExtraBold.ttf',
+                           'OpenSans-LightItalic.ttf',
+                           'OpenSans-Light.ttf',
+                           'OpenSans-SemiboldItalic.ttf',
+                           'OpenSans-BoldItalic.ttf',
+                           'OpenSans-Italic.ttf',
+                           'OpenSans-Bold.ttf',
+                           'OpenSans-Semibold.ttf',
+                           'OpenSans-Regular.ttf']}
 
 FONTS_PATH = {
     'fontawesome':
         ['/usr/share/fonts/fontawesome',
          '/usr/share/fonts/truetype/font-awesome',
-         '/usr/share/fonts/truetype']}
+         '/usr/share/fonts/truetype'],
+    'opensans':
+        ['/usr/share/fonts/open-sans',
+         '/usr/share/fonts/truetype/',
+         '/usr/share/texlive/texmf-dist/fonts/truetype/public/opensans']}
 
 
 def get_object_store():
-- 
2.1.0