From: Martin Pitt <martin@piware.de>
Date: Thu, 14 May 2020 04:54:27 +0000 (+0200)
Subject: Revert "Move to vim-X11"
X-Git-Url: https://piware.de/gitweb/?a=commitdiff_plain;h=dfe85b640;p=bin.git

Revert "Move to vim-X11"

Not useful any more under wayland.

This reverts commit d3e13e0360abdac3209b5c5d431546c1d94abb17.
---

diff --git a/build-devtoolbox b/build-devtoolbox
index 386e0c5..da93958 100755
--- a/build-devtoolbox
+++ b/build-devtoolbox
@@ -37,7 +37,7 @@ sudo dnf install -y make npm fontconfig git valgrind chromium \
     virt-viewer virt-install libappstream-glib \
     expect python3-pycodestyle python3-pyflakes \
     fedpkg rhpkg /usr/bin/oc /usr/bin/genisoimage /usr/bin/pip \
-    man-pages socat wget genisoimage vim-X11 \
+    man-pages socat wget genisoimage vim-enhanced \
     ansible standard-test-roles rsync strace diffstat \
     pwgen glibc-langpack-en tig twine dbus-daemon waiverdb-cli \
     /usr/bin/scanimage /usr/bin/pngquant /usr/bin/convert /usr/bin/pdfjoin
@@ -55,7 +55,3 @@ cat <<EOF | sudo tee /etc/krb5.conf.d/0_file_ccache
 [libdefaults]
     default_ccache_name = FILE:/tmp/krb5.ccache
 EOF
-
-# vim-X11 does not ship vim binary
-type vim >/dev/null 2>&1 || sudo ln -s vimx /usr/bin/vim
-'