2:03 p.m.
The DITA help files should also be included in the RPM and DEB files
which will distribute Kimchi. Only the generated HTML files will be
added
Also, update the README to list the dependecies needed to convert the
DITA files to HTML.
Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com>
---
contrib/DEBIAN/control.in | 2 +-
contrib/kimchi.spec.fedora.in | 5 +++++
contrib/kimchi.spec.suse.in | 5 +++++
docs/README.md | 7 ++++---
4 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in
index 762b3a0..0952490 100644
--- a/contrib/DEBIAN/control.in
+++ b/contrib/DEBIAN/control.in
@@ -22,6 +22,6 @@ Depends: python-cherrypy3 (>= 3.2.0),
python-lxml,
open-iscsi,
firewalld
-Build-Depends:
+Build-Depends: libxslt
Maintainer: Aline Manera <alinefm(a)br.ibm.com>
Description: Kimchi web server
diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in
index 2e36d5c..d628838 100644
--- a/contrib/kimchi.spec.fedora.in
+++ b/contrib/kimchi.spec.fedora.in
@@ -28,6 +28,7 @@ Requires: python-ipaddr
Requires: python-lxml
Requires: nfs-utils
Requires: iscsi-initiator-utils
+BuildRequires: libxslt
%if 0%{?rhel} == 6
Requires: python-ordereddict
@@ -173,6 +174,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/kimchi/ui/libs/themes/base/images/*.gif
%{_datadir}/kimchi/ui/libs/themes/base/jquery-ui.min.css
%{_datadir}/kimchi/ui/pages/*.html.tmpl
+%{_datadir}/kimchi/ui/pages/help/*.html
%{_datadir}/kimchi/ui/pages/tabs/*.html.tmpl
%{_sysconfdir}/kimchi/kimchi.conf
%{_sysconfdir}/kimchi/distros.d/debian.json
@@ -193,6 +195,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Tue Feb 11 2014 Crístian Viana <vianac(a)linux.vnet.ibm.com> 1.1.0
+- Add help pages and XSLT dependency
+
* Tue Jul 16 2013 Adam Litke <agl(a)us.ibm.com> 0.1.0-1
- Adapted for autotools build
diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in
index 15db59b..cbb7b67 100644
--- a/contrib/kimchi.spec.suse.in
+++ b/contrib/kimchi.spec.suse.in
@@ -23,6 +23,7 @@ Requires: python-ipaddr
Requires: python-lxml
Requires: nfs-client
Requires: open-iscsi
+BuildRequires: libxslt-tools
%if 0%{?sles_version} == 11
Requires: python-ordereddict
@@ -95,6 +96,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/kimchi/ui/libs/themes/base/images/*.gif
%{_datadir}/kimchi/ui/libs/themes/base/jquery-ui.min.css
%{_datadir}/kimchi/ui/pages/*.html.tmpl
+%{_datadir}/kimchi/ui/pages/help/*.html
%{_datadir}/kimchi/ui/pages/tabs/*.html.tmpl
%{_sysconfdir}/kimchi/kimchi.conf
%{_sysconfdir}/kimchi/distros.d/debian.json
@@ -105,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT
%{_initrddir}/kimchid
%changelog
+* Tue Feb 11 2014 Crístian Viana <vianac(a)linux.vnet.ibm.com> 1.1.0
+- Add help pages and XSLT dependency
+
* Thu Jul 18 2013 Adam Litke <agl(a)us.ibm.com> 0.1.0-1
- Adapted for autotools build
- Split Suse and Fedora spec files
diff --git a/docs/README.md b/docs/README.md
index 9c7c188..5ac5fde 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -38,7 +38,7 @@ Install Dependencies
PyPAM m2crypto python-jsonschema rpm-build \
qemu-kvm python-psutil python-ethtool sos \
python-ipaddr python-lxml nfs-utils \
- iscsi-initiator-utils
+ iscsi-initiator-utils libxslt
# If using RHEL6, install the following additional packages:
$ sudo yum install python-unittest2 python-ordereddict
# Restart libvirt to allow configuration changes to take effect
@@ -60,7 +60,7 @@ for more information on how to configure your system to access this
repository.
python-pam python-m2crypto python-jsonschema \
qemu-kvm libtool python-psutil python-ethtool \
sosreport python-ipaddr python-lxml nfs-common \
- open-iscsi lvm2
+ open-iscsi lvm2 xsltproc
Packages version requirement:
python-jsonschema >= 1.3.0
@@ -73,7 +73,8 @@ for more information on how to configure your system to access this
repository.
libvirt python-libxml2 python-imaging \
python-pam python-M2Crypto python-jsonschema \
rpm-build kvm python-psutil python-ethtool \
- python-ipaddr python-lxml nfs-client open-iscsi
+ python-ipaddr python-lxml nfs-client open-iscsi \
+ libxslt-tools
Packages version requirement:
python-psutil >= 0.6.0
--
1.8.5.3