[Kimchi-devel] [PATCH WOK 2/2] Remove unnecessary dependencies from Wok and Kimchi
Paulo Ricardo Paz Vital
pvital at linux.vnet.ibm.com
Thu Sep 17 19:32:13 UTC 2015
Reviewed-By: Paulo Vital <pvital at linux.vnet.ibm.com>
On Wed, 2015-09-16 at 14:44 -0300, Aline Manera wrote:
> python-imaging, websockify, novnc and spice-html5 packages are only
> needed by Kimchi. So remove them from Wok.
>
> python-cherrypy, python-cheetah, m2crypto, PyPAM, nginx and python
> -ldap
> packages are only needed by wok. So remove them from Kimchi.
>
> Signed-off-by: Aline Manera <alinefm at linux.vnet.ibm.com>
> ---
> contrib/DEBIAN/control.in | 4 ----
> contrib/wok.spec.fedora.in | 11 -----------
> contrib/wok.spec.suse.in | 4 ----
> plugins/kimchi/contrib/DEBIAN/control.in | 6 ------
> plugins/kimchi/contrib/kimchi.spec.fedora.in | 6 ------
> plugins/kimchi/contrib/kimchi.spec.suse.in | 6 ------
> 6 files changed, 37 deletions(-)
>
> diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in
> index ef4e0c2..fd148fb 100644
> --- a/contrib/DEBIAN/control.in
> +++ b/contrib/DEBIAN/control.in
> @@ -5,9 +5,6 @@ Priority: optional
> Architecture: all
> Depends: python-cherrypy3 (>= 3.2.0),
> python-cheetah,
> - python-imaging,
> - websockify,
> - novnc,
> python-jsonschema (>= 1.3.0),
> gettext,
> python-m2crypto,
> @@ -15,7 +12,6 @@ Depends: python-cherrypy3 (>= 3.2.0),
> python-lxml,
> nginx,
> python-ldap,
> - spice-html5
> Build-Depends: libxslt,
> openssl,
> python-lxml
> diff --git a/contrib/wok.spec.fedora.in b/contrib/wok.spec.fedora.in
> index 037e705..eb7fcb2 100644
> --- a/contrib/wok.spec.fedora.in
> +++ b/contrib/wok.spec.fedora.in
> @@ -10,10 +10,7 @@ Source0: %{name}-%{version}.tar.gz
> Requires: gettext
> Requires: python-cherrypy >= 3.2.0
> Requires: python-cheetah
> -Requires: python-websockify
> -Requires: novnc
> Requires: m2crypto
> -Requires: python-imaging
> Requires: PyPAM
> Requires: python-jsonschema >= 1.3.0
> Requires: python-lxml
> @@ -23,10 +20,6 @@ BuildRequires: libxslt
> BuildRequires: openssl
> BuildRequires: python-lxml
>
> -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 19
> -Requires: spice-html5
> -%endif
> -
> %if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
> %global with_systemd 1
> %endif
> @@ -58,11 +51,7 @@ Wok is Webserver Originated from Kimchi.
>
>
> %build
> -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 19
> %configure
> -%else
> -%configure --with-spice-html5
> -%endif
> make
>
>
> diff --git a/contrib/wok.spec.suse.in b/contrib/wok.spec.suse.in
> index 6bff10a..b55fcf1 100644
> --- a/contrib/wok.spec.suse.in
> +++ b/contrib/wok.spec.suse.in
> @@ -10,9 +10,6 @@ Source0: %{name}-%{version}.tar.gz
> Requires: gettext-tools
> Requires: python-CherryPy >= 3.2.0
> Requires: python-Cheetah
> -Requires: python-websockify
> -Requires: novnc
> -Requires: python-imaging
> Requires: python-M2Crypto
> Requires: python-pam
> Requires: python-jsonschema >= 1.3.0
> @@ -39,7 +36,6 @@ Wok is Webserver Originated from Kimchi.
> %setup
>
> %build
> -%configure --with-spice-html5
> make
>
> %install
> diff --git a/plugins/kimchi/contrib/DEBIAN/control.in
> b/plugins/kimchi/contrib/DEBIAN/control.in
> index ecfcd89..dc153d8 100644
> --- a/plugins/kimchi/contrib/DEBIAN/control.in
> +++ b/plugins/kimchi/contrib/DEBIAN/control.in
> @@ -4,8 +4,6 @@ Section: base
> Priority: optional
> Architecture: all
> Depends: wok,
> - python-cherrypy3 (>= 3.2.0),
> - python-cheetah,
> python-imaging,
> python-configobj,
> websockify,
> @@ -15,9 +13,7 @@ Depends: wok,
> gettext,
> libvirt-bin,
> nfs-common,
> - python-m2crypto,
> qemu-kvm,
> - python-pam,
> python-parted,
> python-psutil (>= 0.6.0),
> python-ethtool,
> @@ -25,9 +21,7 @@ Depends: wok,
> python-ipaddr,
> python-lxml,
> open-iscsi,
> - nginx,
> python-guestfs,
> - python-ldap,
> libguestfs-tools,
> spice-html5
> Build-Depends: libxslt,
> diff --git a/plugins/kimchi/contrib/kimchi.spec.fedora.in
> b/plugins/kimchi/contrib/kimchi.spec.fedora.in
> index fa53980..0db3d7e 100644
> --- a/plugins/kimchi/contrib/kimchi.spec.fedora.in
> +++ b/plugins/kimchi/contrib/kimchi.spec.fedora.in
> @@ -13,14 +13,10 @@ Requires: gettext
> Requires: libvirt
> Requires: libvirt-python
> Requires: libvirt-daemon-config-network
> -Requires: python-cherrypy >= 3.2.0
> -Requires: python-cheetah
> Requires: python-websockify
> Requires: python-configobj
> Requires: novnc
> -Requires: m2crypto
> Requires: python-imaging
> -Requires: PyPAM
> Requires: pyparted
> Requires: python-psutil >= 0.6.0
> Requires: python-jsonschema >= 1.3.0
> @@ -29,9 +25,7 @@ Requires: sos
> Requires: python-ipaddr
> Requires: python-lxml
> Requires: nfs-utils
> -Requires: nginx
> Requires: iscsi-initiator-utils
> -Requires: python-ldap
> Requires: python-libguestfs
> Requires: libguestfs-tools
> BuildRequires: libxslt
> diff --git a/plugins/kimchi/contrib/kimchi.spec.suse.in
> b/plugins/kimchi/contrib/kimchi.spec.suse.in
> index 9b55c7b..e466961 100644
> --- a/plugins/kimchi/contrib/kimchi.spec.suse.in
> +++ b/plugins/kimchi/contrib/kimchi.spec.suse.in
> @@ -13,24 +13,18 @@ Requires: gettext-tools
> Requires: libvirt
> Requires: libvirt-python
> Requires: libvirt-daemon-config-network
> -Requires: python-CherryPy >= 3.2.0
> -Requires: python-Cheetah
> Requires: python-websockify
> Requires: python-configobj
> Requires: novnc
> Requires: python-imaging
> -Requires: python-M2Crypto
> -Requires: python-pam
> Requires: python-parted
> Requires: python-psutil >= 0.6.0
> Requires: python-jsonschema >= 1.3.0
> Requires: python-ethtool
> Requires: python-ipaddr
> -Requires: python-ldap
> Requires: python-lxml
> Requires: python-xml
> Requires: nfs-client
> -Requires: nginx
> Requires: open-iscsi
> Requires: python-libguestfs
> Requires: guestfs-tools
More information about the Kimchi-devel
mailing list