1:53 p.m.
From: samhenri <samuel.guimaraes(a)eldorado.org.br>
Signed-off-by: samhenri <samuel.guimaraes(a)eldorado.org.br>
---
Makefile.am | 2 ++
contrib/DEBIAN/control.in | 3 ++-
contrib/wok.spec.fedora.in | 1 +
contrib/wok.spec.suse.in | 1 +
docs/README.md | 6 +++---
src/wok/plugins/kimchi/contrib/DEBIAN/control.in | 3 ++-
src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in | 1 +
src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in | 1 +
8 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 3d3b5d6..8d2f346 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,6 +65,8 @@ all-local:
$(MKDIR_P) $$dir ; \
ln -sf ../../../po/$$L.gmo $$dir/wok.mo ; \
done < po/LINGUAS
+ pip install cython --no-input
+ pip install libsass --no-input --upgrade
#
# Packaging helpers
diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in
index 50dc837..606be3b 100644
--- a/contrib/DEBIAN/control.in
+++ b/contrib/DEBIAN/control.in
@@ -18,6 +18,7 @@ Depends: python-cherrypy3 (>= 3.2.0),
Build-Depends: libxslt,
openssl,
python-lxml,
- pkg-config
+ pkg-config,
+ python-pip
Maintainer: Aline Manera <alinefm(a)br.ibm.com>
Description: Wok - Webserver Originated from Kimchi
diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in
index 42a024a..9a44643 100644
--- a/contrib/wok.spec.fedora.in
+++ b/contrib/wok.spec.fedora.in
@@ -22,6 +22,7 @@ Requires: open-sans-fonts
BuildRequires: libxslt
BuildRequires: openssl
BuildRequires: python-lxml
+BuildRequires: python-pip
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
%global with_systemd 1
diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in
index 7dc67ad..34a0498 100644
--- a/contrib/wok.spec.suse.in
+++ b/contrib/wok.spec.suse.in
@@ -23,6 +23,7 @@ Requires: google-opensans-fonts
BuildRequires: libxslt-tools
BuildRequires: openssl
BuildRequires: python-lxml
+BuildRequires: python-pip
%if 0%{?suse_version} == 1100
Requires: python-ordereddict
diff --git a/docs/README.md b/docs/README.md
index f0b8697..6e53de3 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -53,7 +53,7 @@ Install Dependencies
python-cherrypy python-cheetah python-imaging\
PyPAM m2crypto python-jsonschema rpm-build \
python-psutil python-ldap python-lxml \
- libxslt nginx openssl
+ libxslt nginx openssl python-pip
# If using RHEL, install the following additional packages:
@@ -79,7 +79,7 @@ channel at RHN Classic or Red Hat Satellite.
python-cherrypy3 python-cheetah python-imaging \
python-pam python-m2crypto python-jsonschema \
python-psutil python-ldap python-lxml nginx \
- libxslt openssl
+ libxslt openssl python-pip
Packages version requirement:
python-jsonschema >= 1.3.0
@@ -94,7 +94,7 @@ channel at RHN Classic or Red Hat Satellite.
python-CherryPy python-Cheetah python-pam \
python-imaging python-M2Crypto python-jsonschema \
rpm-build python-psutil python-ldap python-lxml \
- libxslt-tools python-xml nginx openssl
+ libxslt-tools python-xml nginx openssl python-pip
Packages version requirement:
python-psutil >= 0.6.0
diff --git a/src/wok/plugins/kimchi/contrib/DEBIAN/control.in
b/src/wok/plugins/kimchi/contrib/DEBIAN/control.in
index cad08af..e87db51 100644
--- a/src/wok/plugins/kimchi/contrib/DEBIAN/control.in
+++ b/src/wok/plugins/kimchi/contrib/DEBIAN/control.in
@@ -26,6 +26,7 @@ Depends: wok,
spice-html5,
python-magic
Build-Depends: libxslt,
- python-lxml
+ python-lxml,
+ python-pip
Maintainer: Aline Manera <alinefm(a)br.ibm.com>
Description: Kimchi web application
diff --git a/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in
b/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in
index 337b807..656771c 100644
--- a/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in
+++ b/src/wok/plugins/kimchi/contrib/kimchi.spec.fedora.in
@@ -31,6 +31,7 @@ Requires: libguestfs-tools
Requires: python-magic
BuildRequires: libxslt
BuildRequires: python-lxml
+BuildRequires: python-pip
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 19
Requires: spice-html5
diff --git a/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in
b/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in
index 2d53aa9..950a500 100644
--- a/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in
+++ b/src/wok/plugins/kimchi/contrib/kimchi.spec.suse.in
@@ -31,6 +31,7 @@ Requires: guestfs-tools
Requires: python-magic
BuildRequires: libxslt-tools
BuildRequires: python-lxml
+BuildRequires: python-pip
%if 0%{?suse_version} == 1100
Requires: python-ordereddict
--
1.9.3