From 83e17eb53d9aac101b8d5ed02ac44b7e677efb11a8eb08229b88fe88cae3d3e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Wed, 14 Feb 2018 12:51:49 +0000
Subject: [PATCH] - Split vim-data into vim-data-common package for low-disk
 usage   scenarios bsc#1078722 bsc#1078554 bsc#1075541 - Make set mouse=
 default in suse.vimrc bsc#1079185 bsc#1078564   bsc#1067890 bsc#1064068
 bsc#1062691

OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=480
---
 suse.vimrc  |  3 +++
 vim.changes |  8 ++++++++
 vim.spec    | 31 +++++++++++++++++++++++++++++--
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/suse.vimrc b/suse.vimrc
index 403dd59..5c5c11f 100644
--- a/suse.vimrc
+++ b/suse.vimrc
@@ -70,6 +70,9 @@ set nocompatible
 " allow backspacing over everything in insert mode 
 set backspace=indent,eol,start
 
+" Fix cut-n-paste bsc#1079185
+set mouse=
+
 " Complete longest common string, then each full match
 " enable this for bash compatible behaviour
 " set wildmode=longest,full
diff --git a/vim.changes b/vim.changes
index ed29f01..c63d493 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Feb 14 12:39:39 UTC 2018 - idonmez@suse.com
+
+- Split vim-data into vim-data-common package for low-disk usage
+  scenarios bsc#1078722 bsc#1078554 bsc#1075541
+- Make set mouse= default in suse.vimrc bsc#1079185 bsc#1078564
+  bsc#1067890 bsc#1064068 bsc#1062691
+
 -------------------------------------------------------------------
 Wed Jan 31 10:49:07 UTC 2018 - idonmez@suse.com
 
diff --git a/vim.spec b/vim.spec
index 7aaf394..6738094 100644
--- a/vim.spec
+++ b/vim.spec
@@ -83,7 +83,7 @@ BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(xt)
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
-Requires:       vim-data = %{version}-%{release}
+Requires:       vim-data-common = %{version}-%{release}
 Conflicts:      vim-base < 8.0
 Provides:       vi
 Provides:       vim-base = %{version}-%{release}
@@ -108,11 +108,20 @@ Summary:        Vi IMproved
 Group:          Productivity/Editors/Vi
 Obsoletes:      vim-plugin-matchit <= 1.13.2
 Provides:       vim-plugin-matchit = 1.13.2
+Requires:       vim-data-common = %{version}-%{release}
 BuildArch:      noarch
 
 %description data
 This package contains optional runtime & syntax files for vim.
 
+%package data-common
+Summary:        Vi IMproved
+Group:          Productivity/Editors/Vi
+BuildArch:      noarch
+
+%description data-common
+This package contains common runtime & syntax files for vim and gvim.
+
 %package -n gvim
 Summary:        A GUI for Vi
 Group:          Productivity/Editors/Vi
@@ -343,7 +352,6 @@ trap "printf '\e[r'" EXIT
 %ifarch ppc ppc64 ppc64le
 LC_ALL=en_US.UTF-8 make -j1 test || { echo "Ignore transient errors for PowerPC. boo#1072651"; }
 %else
-make -j1 test
 LC_ALL=en_US.UTF-8 make -j1 test
 %endif
 
@@ -437,6 +445,15 @@ fi
 %dir %{site_runtimepath}/after/syntax/
 
 %files data
+# exclude common files
+%exclude %{_datadir}/vim/%{VIM_SUBDIR}/autoload/dist/ft.vim
+%exclude %{_datadir}/vim/%{VIM_SUBDIR}/syntax/nosyntax.vim
+%exclude %{_datadir}/vim/%{VIM_SUBDIR}/syntax/resolv.vim
+%exclude %{_datadir}/vim/%{VIM_SUBDIR}/syntax/sh.vim
+%exclude %{_datadir}/vim/%{VIM_SUBDIR}/syntax/syncolor.vim
+%exclude %{_datadir}/vim/%{VIM_SUBDIR}/syntax/synload.vim
+%exclude %{_datadir}/vim/%{VIM_SUBDIR}/syntax/syntax.vim
+%exclude %{_datadir}/vim/%{VIM_SUBDIR}/syntax/vim.vim
 # data files
 %{_datadir}/vim/%{VIM_SUBDIR}/autoload/*
 %{_datadir}/vim/%{VIM_SUBDIR}/colors/*
@@ -455,6 +472,16 @@ fi
 %{_datadir}/vim/%{VIM_SUBDIR}/syntax/*
 %{_datadir}/vim/%{VIM_SUBDIR}/tools/*
 %{_datadir}/vim/%{VIM_SUBDIR}/tutor/*
+
+%files data-common
+%{_datadir}/vim/%{VIM_SUBDIR}/autoload/dist/ft.vim
+%{_datadir}/vim/%{VIM_SUBDIR}/syntax/nosyntax.vim
+%{_datadir}/vim/%{VIM_SUBDIR}/syntax/resolv.vim
+%{_datadir}/vim/%{VIM_SUBDIR}/syntax/sh.vim
+%{_datadir}/vim/%{VIM_SUBDIR}/syntax/syncolor.vim
+%{_datadir}/vim/%{VIM_SUBDIR}/syntax/synload.vim
+%{_datadir}/vim/%{VIM_SUBDIR}/syntax/syntax.vim
+%{_datadir}/vim/%{VIM_SUBDIR}/syntax/vim.vim
 %{_datadir}/vim/%{VIM_SUBDIR}/*.vim
 %{_datadir}/vim/%{VIM_SUBDIR}/rgb.txt