From df29936cf8bbf2b9e3f58167cf69129e3c851fb6 Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com>
Date: Fri, 17 Mar 2017 13:39:56 +0100
Subject: [PATCH] p2v: un-duplicate common dependencies

Move all the dependencies with the same name in all the distributions to
a single list at the end.

There should be no change to the package list used to build the p2v ISO.
---
 p2v/dependencies.m4 | 72 +++++++++++++--------------------------------
 1 file changed, 21 insertions(+), 51 deletions(-)

diff --git a/p2v/dependencies.m4 b/p2v/dependencies.m4
index adbac2625..2037477ca 100644
--- a/p2v/dependencies.m4
+++ b/p2v/dependencies.m4
@@ -31,27 +31,12 @@ ifelse(REDHAT,1,
   dnl Run as external programs by the p2v binary.
   /usr/bin/ssh
   /usr/bin/qemu-nbd
-  gawk
-  curl
-  ethtool
-  util-linux
   which
-  xterm
-  pciutils
-  lsscsi
-  usbutils
 
   dnl Generally useful tools to use within xterm
-  less
   vim-minimal
 
-  dnl The hwdata package contains PCI IDs, used by virt-p2v to display
-  dnl network vendor information (RHBZ#855059).
-  hwdata
-
   dnl Useful disk and diagnostic utilities.
-  hdparm
-  smartmontools
   iscsi-initiator-utils
 
   dnl X11 environment
@@ -84,20 +69,8 @@ ifelse(DEBIAN,1,
   ifdef(`HAVE_LIBVIRT', `libvirt0')
   openssh-client
   qemu-utils
-  gawk
-  curl
-  ethtool
-  util-linux
   debianutils
-  xterm
-  pciutils
-  lsscsi
-  usbutils
-  less
   vim-tiny
-  hwdata
-  hdparm
-  smartmontools
   open-iscsi
   xorg
   xserver-xorg-video-all
@@ -118,20 +91,8 @@ ifelse(ARCHLINUX,1,
   ifdef(`HAVE_LIBVIRT', `libvirt')
   openssh
   qemu
-  gawk
-  curl
-  ethtool
-  util-linux
   which
-  xterm
-  pciutils
-  lsscsi
-  usbutils
-  less
   vim-tiny
-  hwdata
-  hdparm
-  smartmontools
   open-iscsi
   xorg-xinit
   xorg-server
@@ -153,20 +114,8 @@ ifelse(SUSE,1,
   ifdef(`HAVE_LIBVIRT', `libvirt-libs')
   qemu-tools
   openssh
-  gawk
-  curl
-  ethtool
-  util-linux
   dnl /usr/bin/which is in util-linux on SUSE
-  xterm
-  pciutils
-  lsscsi
-  usbutils
-  less
   vim
-  hwdata
-  hdparm
-  smartmontools
   open-iscsi
   xinit
   xorg-x11-server
@@ -180,3 +129,24 @@ ifelse(SUSE,1,
   libyui-qt
   SuSEfirewall2
 )
+
+dnl Run as external programs by the p2v binary.
+curl
+ethtool
+gawk
+lsscsi
+pciutils
+usbutils
+util-linux
+xterm
+
+dnl Generally useful tools to use within xterm
+less
+
+dnl The hwdata package contains PCI IDs, used by virt-p2v to display
+dnl network vendor information (RHBZ#855059).
+hwdata
+
+dnl Useful disk and diagnostic utilities.
+hdparm
+smartmontools