From ebb9d8cdd127f17cae36713024d63319d38408c7 Mon Sep 17 00:00:00 2001 From: slin14 Date: Tue, 14 Aug 2018 23:05:30 +0800 Subject: [PATCH] rebase vim patch to CentOS7.5 vimrc customization is no longer need, so switch to use rpm. Story: 2003389 Task: 24480 Change-Id: I39d9a431b04aa52e4f7da86e4ebdbc4a6c48a740 Signed-off-by: slin14 --- base/vim/centos/build_srpm.data | 2 - ...te-package-versioning-for-TIS-format.patch | 27 ------ base/vim/centos/meta_patches/PATCH_ORDER | 1 - base/vim/centos/srpm_path | 1 - base/vim/files/vimrc | 92 ------------------- centos_pkg_dirs | 1 - 6 files changed, 124 deletions(-) delete mode 100644 base/vim/centos/build_srpm.data delete mode 100644 base/vim/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch delete mode 100644 base/vim/centos/meta_patches/PATCH_ORDER delete mode 100644 base/vim/centos/srpm_path delete mode 100644 base/vim/files/vimrc diff --git a/base/vim/centos/build_srpm.data b/base/vim/centos/build_srpm.data deleted file mode 100644 index 2ec7ea02f..000000000 --- a/base/vim/centos/build_srpm.data +++ /dev/null @@ -1,2 +0,0 @@ -COPY_LIST="files/*" -TIS_PATCH_VER=1 diff --git a/base/vim/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/vim/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch deleted file mode 100644 index 848bd6e93..000000000 --- a/base/vim/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 852f734a938c881248d48feb9eb9e0f80d27af55 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 15:54:16 -0400 -Subject: [PATCH 1/1] WRS: 0001-Update-package-versioning-for-TIS-format.patch - -Conflicts: - SPECS/vim.spec ---- - SPECS/vim.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/vim.spec b/SPECS/vim.spec -index 3cc96c2..be1a56c 100644 ---- a/SPECS/vim.spec -+++ b/SPECS/vim.spec -@@ -20,7 +20,7 @@ Summary: The VIM editor - URL: http://www.vim.org/ - Name: vim - Version: %{baseversion}.%{patchlevel} --Release: 2%{?dist} -+Release: 2.el7%{?_tis_dist}.%{tis_patch_ver} - License: Vim - Group: Applications/Editors - Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2 --- -1.9.1 - diff --git a/base/vim/centos/meta_patches/PATCH_ORDER b/base/vim/centos/meta_patches/PATCH_ORDER deleted file mode 100644 index 91f9a80ea..000000000 --- a/base/vim/centos/meta_patches/PATCH_ORDER +++ /dev/null @@ -1 +0,0 @@ -0001-Update-package-versioning-for-TIS-format.patch diff --git a/base/vim/centos/srpm_path b/base/vim/centos/srpm_path deleted file mode 100644 index 2749149ae..000000000 --- a/base/vim/centos/srpm_path +++ /dev/null @@ -1 +0,0 @@ -mirror:Source/vim-7.4.160-2.el7.src.rpm diff --git a/base/vim/files/vimrc b/base/vim/files/vimrc deleted file mode 100644 index aa57c277c..000000000 --- a/base/vim/files/vimrc +++ /dev/null @@ -1,92 +0,0 @@ -" An example for a vimrc file. -" -" Maintainer: Bram Moolenaar -" Last change: 2008 Jul 02 -" -" To use it, copy it to -" for Unix and OS/2: ~/.vimrc -" for Amiga: s:.vimrc -" for MS-DOS and Win32: $VIM\_vimrc -" for OpenVMS: sys$login:.vimrc - -" When started as "evim", evim.vim will already have done these settings. -if v:progname =~? "evim" - finish -endif - -" Use Vim settings, rather then Vi settings (much better!). -" This must be first, because it changes other options as a side effect. -set nocompatible - -" allow backspacing over everything in insert mode -set backspace=indent,eol,start - -set nobackup " do not keep a backup file, use versions instead -set history=50 " keep 50 lines of command line history -set ruler " show the cursor position all the time -set showcmd " display incomplete commands -set incsearch " do incremental searching - -" For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries -" let &guioptions = substitute(&guioptions, "t", "", "g") - -" Don't use Ex mode, use Q for formatting -map Q gq - -" CTRL-U in insert mode deletes a lot. Use CTRL-G u to first break undo, -" so that you can undo CTRL-U after inserting a line break. -inoremap u - -" In many terminal emulators the mouse works just fine, thus enable it. -if has('mouse') - set mouse-=a -endif - -" Switch syntax highlighting on, when the terminal has colors -" Also switch on highlighting the last used search pattern. -"if &t_Co > 2 || has("gui_running") -" syntax on -" set hlsearch -"endif - -" Only do this part when compiled with support for autocommands. -if has("autocmd") - - " Enable file type detection. - " Use the default filetype settings, so that mail gets 'tw' set to 72, - " 'cindent' is on in C files, etc. - " Also load indent files, to automatically do language-dependent indenting. - filetype plugin indent off - - " Put these in an autocmd group, so that we can delete them easily. - augroup vimrcEx - au! - - " For all text files set 'textwidth' to 78 characters. - autocmd FileType text setlocal textwidth=78 - - " When editing a file, always jump to the last known cursor position. - " Don't do it when the position is invalid or when inside an event handler - " (happens when dropping a file on gvim). - " Also don't do it when the mark is in the first line, that is the default - " position when opening a file. - autocmd BufReadPost * - \ if line("'\"") > 1 && line("'\"") <= line("$") | - \ exe "normal! g`\"" | - \ endif - - augroup END - -else - - set autoindent " always set autoindenting on - -endif " has("autocmd") - -" Convenient command to see the difference between the current buffer and the -" file it was loaded from, thus the changes you made. -" Only define it when not defined already. -if !exists(":DiffOrig") - command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis - \ | wincmd p | diffthis -endif diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 44faedf58..73f0717d5 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -13,7 +13,6 @@ config/facter virt/qemu filesystem/nfscheck utilities/update-motd -base/vim python/python-2.7.5 python/python-django python/python-setuptools