[PATCH] add libxml2 to BuildRequires list

From: ShaoHe Feng <shaohef@linux.vnet.ibm.com> 91bab78 import libxml2 when generate index.html during build time. Need add libxml2 to BuildRequires list. Signed-off-by: ShaoHe Feng <shaohef@linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 3 ++- contrib/kimchi.spec.fedora.in | 3 ++- contrib/kimchi.spec.suse.in | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 0952490..1b03fc7 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -22,6 +22,7 @@ Depends: python-cherrypy3 (>= 3.2.0), python-lxml, open-iscsi, firewalld -Build-Depends: libxslt +Build-Depends: libxslt, + python-libxml2 Maintainer: Aline Manera <alinefm@br.ibm.com> Description: Kimchi web server diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 0511527..44654f0 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -28,7 +28,8 @@ Requires: python-ipaddr Requires: python-lxml Requires: nfs-utils Requires: iscsi-initiator-utils -BuildRequires: libxslt +BuildRequires: libxslt +BuildRequires: libxml2-python %if 0%{?rhel} == 6 Requires: python-ordereddict diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index cbb7b67..978f6a5 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -23,7 +23,8 @@ Requires: python-ipaddr Requires: python-lxml Requires: nfs-client Requires: open-iscsi -BuildRequires: libxslt-tools +BuildRequires: libxslt-tools +BuildRequires: python-libxml2 %if 0%{?sles_version} == 11 Requires: python-ordereddict -- 1.8.4.2

Reviewed-by: Leonardo Garcia <lagarcia@br.ibm.com> I really think that we need to be more careful with adding imports in our python code. I think it is not the first time we break installation because of an added dependency without further notice. There must be a minimal test environment to test Kimchi in which no dependencies are installed. That way, every time someone makes a change and test in this environment, any issue like this one will be caught. Best regards, Leonardo Garcia On 02/19/2014 01:14 AM, shaohef@linux.vnet.ibm.com wrote:
From: ShaoHe Feng <shaohef@linux.vnet.ibm.com>
91bab78 import libxml2 when generate index.html during build time. Need add libxml2 to BuildRequires list.
Signed-off-by: ShaoHe Feng <shaohef@linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 3 ++- contrib/kimchi.spec.fedora.in | 3 ++- contrib/kimchi.spec.suse.in | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 0952490..1b03fc7 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -22,6 +22,7 @@ Depends: python-cherrypy3 (>= 3.2.0), python-lxml, open-iscsi, firewalld -Build-Depends: libxslt +Build-Depends: libxslt, + python-libxml2 Maintainer: Aline Manera <alinefm@br.ibm.com> Description: Kimchi web server diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 0511527..44654f0 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -28,7 +28,8 @@ Requires: python-ipaddr Requires: python-lxml Requires: nfs-utils Requires: iscsi-initiator-utils -BuildRequires: libxslt +BuildRequires: libxslt +BuildRequires: libxml2-python
%if 0%{?rhel} == 6 Requires: python-ordereddict diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index cbb7b67..978f6a5 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -23,7 +23,8 @@ Requires: python-ipaddr Requires: python-lxml Requires: nfs-client Requires: open-iscsi -BuildRequires: libxslt-tools +BuildRequires: libxslt-tools +BuildRequires: python-libxml2
%if 0%{?sles_version} == 11 Requires: python-ordereddict
participants (3)
-
Aline Manera
-
Leonardo Augusto Guimarães Garcia
-
shaohef@linux.vnet.ibm.com