From 367ec305e46a05d6952c0e283b2ea6d73de1c8b8e07992d1dc561cd1d2b594e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Wed, 24 Jan 2018 11:52:23 +0000
Subject: [PATCH] - Make vim require vim-data bsc#1077352 bsc#1075541
 bsc#1074790

OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=475
---
 missing-vim-client |  3 ---
 vim.changes        |  5 +++++
 vim.spec           | 54 +++++-----------------------------------------
 3 files changed, 10 insertions(+), 52 deletions(-)
 delete mode 100644 missing-vim-client

diff --git a/missing-vim-client b/missing-vim-client
deleted file mode 100644
index 3795632..0000000
--- a/missing-vim-client
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-echo "You do not have a valid vim binary package installed. Please install either \"vim\", \"vim-enhanced\" or \"gvim\"." >&2
-exit 1
diff --git a/vim.changes b/vim.changes
index 8f40f27..c24ef5c 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 24 11:15:08 UTC 2018 - idonmez@suse.com
+
+- Make vim require vim-data bsc#1077352 bsc#1075541 bsc#1074790
+
 -------------------------------------------------------------------
 Wed Jan 17 11:18:07 UTC 2018 - tchvatal@suse.com
 
diff --git a/vim.spec b/vim.spec
index 2414bd6..35c7278 100644
--- a/vim.spec
+++ b/vim.spec
@@ -39,7 +39,6 @@ Source10:       README.Japanese-XIM
 Source13:       vitmp.c
 Source14:       vitmp.1
 Source15:       vim132
-Source18:       missing-vim-client
 Source19:       gvim.desktop
 Source20:       spec.skeleton
 Source23:       apparmor.vim
@@ -84,7 +83,7 @@ BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(xt)
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
-Recommends:     vim-data = %{version}-%{release}
+Requires:       vim-data = %{version}-%{release}
 Conflicts:      vim-base < 8.0
 Provides:       vi
 Provides:       vim-base = %{version}-%{release}
@@ -301,9 +300,6 @@ install -D -m 0644 \
 install -D -m 0644 \
     README.Japanese-XIM runtime/gvimrc_example.vim suse.gvimrc \
   %{buildroot}%{_docdir}/gvim/
-#
-# stupid helper
-install -m 0755 %{SOURCE18} %{buildroot}%{_datadir}/vim/current/tools/missing-vim-client
 
 # remove unecessary duplicate manpages
 rm -rf %{buildroot}%{_mandir}/fr.ISO8859-1/
@@ -439,23 +435,6 @@ fi
 %dir %{site_runtimepath}/ftdetect/
 %dir %{site_runtimepath}/after/
 %dir %{site_runtimepath}/after/syntax/
-#
-%{_datadir}/vim/%{VIM_SUBDIR}/bugreport.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/defaults.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/evim.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/filetype.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/ftoff.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/ftplugin.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/ftplugof.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/indent.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/indoff.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/optwin.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/rgb.txt
-%{_datadir}/vim/%{VIM_SUBDIR}/scripts.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/skeletons/skeleton.spec
-# stupid helper
-# THIS BREAKS THE BUILD: %{_datadir}/vim/current/tools/missing-vim-client
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/missing-vim-client
 
 %files data
 # data files
@@ -471,36 +450,13 @@ fi
 %{_datadir}/vim/%{VIM_SUBDIR}/pack/*
 %{_datadir}/vim/%{VIM_SUBDIR}/plugin/*
 %{_datadir}/vim/%{VIM_SUBDIR}/print/*
+%{_datadir}/vim/%{VIM_SUBDIR}/skeletons/*
 %{_datadir}/vim/%{VIM_SUBDIR}/spell/*
 %{_datadir}/vim/%{VIM_SUBDIR}/syntax/*
-#%{_datadir}/vim/%{VIM_SUBDIR}/tools/blink.c
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/ccfilter.1
-#%{_datadir}/vim/%{VIM_SUBDIR}/tools/ccfilter.c
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/ccfilter_README.txt
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/efm_filter.pl
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/efm_filter.txt
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/efm_perl.pl
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/mve.awk
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/mve.txt
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/pltags.pl
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/README.txt
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/ref
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/shtags.1
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/shtags.pl
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/unicode.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/vim132
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/vimm
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/vimspell.sh
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/vimspell.txt
-%{_datadir}/vim/%{VIM_SUBDIR}/tools/vim_vs_net.cmd
-#%{_datadir}/vim/%{VIM_SUBDIR}/tools/xcmdsrv_client.c
+%{_datadir}/vim/%{VIM_SUBDIR}/tools/*
 %{_datadir}/vim/%{VIM_SUBDIR}/tutor/*
-%{_datadir}/vim/%{VIM_SUBDIR}/delmenu.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/gvimrc_example.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/menu.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/mswin.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/synmenu.vim
-%{_datadir}/vim/%{VIM_SUBDIR}/vimrc_example.vim
+%{_datadir}/vim/%{VIM_SUBDIR}/*.vim
+%{_datadir}/vim/%{VIM_SUBDIR}/rgb.txt
 
 %files -n gvim
 %doc runtime/doc/gui_x11.txt