From 1401a3eb97fd13814659efe54752dc6df853477f Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 14:07:26 +0000
Subject: auto-import changelog data from vim-6.2.214-1.src.rpm

Thu Jan 29 2004 Karsten Hopp <karsten@redhat.de> 6.2.214-1
- Patchlevel 214
6.2.195-5
- Fix call to is_selinux_enabled()
Sat Jan 24 2004 Karsten Hopp <karsten@redhat.de> 6.2.195-4
- fix perl requirement
6.2.195-3
- Only attempt to change context if it is different
Thu Jan 22 2004 Karsten Hopp <karsten@redhat.de> 6.2.195-1
- update to patchlevel 195
- enable ppc64 build
Mon Jan 12 2004 Karsten Hopp <karsten@redhat.de> 6.2.180-2
- vim-enhanced requires perl >= 5.8.2 (#111592)
Mon Jan 12 2004 Karsten Hopp <karsten@redhat.de> 6.2.180-1
- Patchlevel 180
- update spec.vim, use g:packager instead of {Packager} macro
6.2.154-7
- Enable selinux support for vim-minimal
6.2.154-6
- Enable selinux support
6.2.154-5
- rebuild with new perl
6.2.154-4
- fix sh.vim syntax file (#104312)
6.2.154-3
- perl interface was disabled when perl had thread support.
6.2.154-2
- fix date in specfile changelog entries
6.2.154-1
- Patchlevel 154
- vim-minimal doesn't really require vim-common to run, removed dependency
    (#109819)
6.2.149-1
- Patchlevel 149
- fix fstab syntax file (Robert G. (Doc) Savage)
- lots of updates for syntax files, macros, documentation
- disable vimnotvi patch so that vim's behaviour matches documentation
- clean up vimrc
6.2.145-1
- rebuild with new Python
- Patchlevel 145

---

diff --git a/README.patches b/README.patches
index c50da54..aef83e1 100644
--- a/README.patches
+++ b/README.patches
@@ -20,6 +20,12 @@ an argument to make it patch the right file:
 After applying a patch, you need to compile Vim.  There are no
 patches for binaries.
 
+
+Collection of patches for Vim 6.2:
+  SIZE  NAME                  INCLUDES
+ 68765  6.2.001-100.gz	      patches 6.2.001 to 6.2.100, gzip'ed
+138268  6.2.101-200.gz        patches 6.2.101 to 6.2.200, gzip'ed
+
 Individual patches for Vim 6.2:
   SIZE  NAME     FIXES
   2146  6.2.001  help tags for ":stopinsert" were missing
@@ -143,6 +149,100 @@ Individual patches for Vim 6.2:
   6132  6.2.119  (after 6.2.107) DOS/Windows source archive misses a few files
   2287  6.2.120  Win32 GUI: console dialogs are not supported for no reason
   1503  6.2.121  (after 6.2.118) not every make accepts += in Makefile
+  4137  6.2.122  (after 6.2.119) Aap recipe missing; add "clean" maze program
+  2032  6.2.123  (after 6.2.118) running configure fails on "=="
+ 11900  6.2.124  (after 6.2.121)(extra) problem with M4FLAGS and runtime files
+  1939  6.2.125  Win32: the winsock2.h file is not always available
+  1531  6.2.126  Win32: CTRL-C for confirm() doesn't throw an exception
+  1574  6.2.127  (extra) Win32 console: no exception for CTRL-C in confirm()
+  1889  6.2.128  (after 6.2.118) configure script is older than configure.in
+  2212  6.2.129  add columns to 'wrapmargin' for 'number' and other options
+  1942  6.2.130  (extra) Win32 console: 'norestorescreen' clears screen on exit
+  1715  6.2.131  (extra) Win32 GUI: leaking font handles when switching fonts
+  2618  6.2.132  (extra) Win32 console: doesn't work on Windows Server 2003
+  2180  6.2.133  error message for 'imactivatekey' may be given at wrong moment
+  3997  6.2.134  (extra) Win32: avoid unnecessary redrawing when scrolling
+  1530  6.2.135  <> argument of ":command" is interpreted as <args>
+  1782  6.2.136  ":e ++enc=utf8 newfile" did not set 'fenc' in a new file
+  4414  6.2.137  "d%" can't be repeated when using the matchit plugin
+  2268  6.2.138  (extra) VMS: compilation problems in vms_read()
+  5688  6.2.139  code is repeated in two Perl files
+ 10751  6.2.140  (after 6.2.121) Mac: compiling with Python/Perl doesn't work
+  3757  6.2.141  (extra) Mac: The b_FSSpec field is sometimes unused
+ 13862  6.2.142  (after 5.2.124) Mac: can't compile without Carbon
+  2105  6.2.143  "K" in Visual mode fails to include all bytes of last char
+  7081  6.2.144  2html script doesn't work correctly when g:html_use_css is set
+  1388  6.2.145  undefining "bool" in vim.h doesn't work for some systems
+  3026  6.2.146  warning for iconv() argument because of wrong prototype
+  2209  6.2.147  substituting with "\=col('.')" always resulted in "1"
+  4007  6.2.148  an insert action can't be partly undone; add CTRL-G u
+  4906  6.2.149  display errors and a crash when using over 21,474,748 lines
+  2709  6.2.150  when reading from stdin lines are broken at NUL characters
+  2467  6.2.151  "--remote +startinsert" inserts commands as text
+  1471  6.2.152  cursor() doesn't reset the offset for 'virtualedit'
+  2555  6.2.153  Win32: ":lang german" doesn't use German messages
+  3001  6.2.154  Python bails out when giving a warning message
+  1561  6.2.155  Win32: ":tjump www" results in two matches, should be one
+  1767  6.2.156  Win32: NetBeans fails to build because EINTR is undefined
+  1656  6.2.157  "%p" in 'errorformat' uses a wrong column number
+  2643  6.2.158  configure doesn't get the right compile flags for Perl
+  1843  6.2.159  "undo" in 'foldopen' doesn't work with expression folding
+  1711  6.2.160  crash with 'virtualedit' and selecting double-wide character
+  4432  6.2.161  (extra) VMS: missing include file; avoid busy wait
+  1372  6.2.162  ":redraw" doesn't adjust the view before redrawing
+  2286  6.2.163  "AAPDIR" directories should not be installed
+  2984  6.2.164  (after 6.2.144) 2html script still fails when css used
+  2318  6.2.165  autoconf 2.57 cannot handle the configure script
+  3980  6.2.166  the gzip plugin doesn't work when $GZIP contains -N
+  2985  6.2.167  the Python interface may leak memory
+  3428  6.2.168  Python interface: can't get the indices from a range object
+  1716  6.2.169  get a warning for the _Xmblen() prototype
+  2547  6.2.170  when using Sun Workshop 'autochdir' isn't set automatically
+  2389  6.2.171  (after 6.2.163) not all "find" versions accept "-or"
+  1737  6.2.172  (after 6.2.169) _Xmblen prototype still causes trouble
+  7194  6.2.173  (extra) Ruby 1.8 doesn't work with Cygwin, MingW and BC5
+  3003  6.2.174  mouse click at hit-enter prompt only works in last line
+  2048  6.2.175  setting 'backupext' in a *WritePre autocommand doesn't work
+  2226  6.2.176  accented characters in help are not used in 'iskeyword'
+  5518  6.2.177  (extra) VisVim: space in file name, random chars are executed
+  2266  6.2.178  newbies can't figure out how to exit and try CTRL-C 
+  8091  6.2.179  (extra) English message translations don't work
+  3564  6.2.180  Win32: compiling with GTK doesn't work
+  2477  6.2.181  (after 6.2.171) CVS directories still unecessarily installed
+  2258  6.2.182  tiny features compile fails with missing get_past_head()
+  1685  6.2.183  warning for char vs char_u pointer use
+ 17719  6.2.184  when auto-formatting text paragraph may be split
+ 16279  6.2.185  resizing windows (from session) doesn't work properly
+ 25517  6.2.186  (after 6.2.185) mistakes in eval.txt help file
+ 14704  6.2.187  reading uninit. memory and memory leaks detected by Insure
+  1398  6.2.188  (extra) Win32: window title can't have multi-byte chars
+  1814  6.2.189  no marks stored when setting 'viminfo' after reading a buffer
+ 14493  6.2.190  marks are lost when editing a compressed file
+ 15447  6.2.191  information about registering and sponsoring is missing
+  1620  6.2.192  using CTRL-T and CTRL-D with "gR" messes up the text
+ 12364  6.2.193  recalling search pat from history has problems with separator
+ 27798  6.2.194  (after 6.2.068) NetBeans needs to save a file itself
+  2080  6.2.195  (after 6.2.190) compiling fails on missing symbol
+  1635  6.2.196  (after 6.2.191) help tags from sponsor.txt are missing
+  4685  6.2.197  can't redraw statuslines without side effects
+  1535  6.2.198  a few messages are not marked to be translated
+  4958  6.2.199  (after 6.2.194) NetBeans: reset timestamp when saving et al.
+  1907  6.2.200  recovering a file doesn't set 'ff', 'fenc', etc. correctly
+  2383  6.2.201  ":qall" doesn't obey the 'autowriteall' option
+ 29178  6.2.202  use filetype "ch" for CH script, "chill" for Chill (was "ch")
+  1787  6.2.203  "3P" and "3p" don't work as expected with characterwise text
+  2055  6.2.204  "]]" skips over closed folds
+  2868  6.2.205  (extra) Win32: Vim window posn. wrong when taskbar at the left
+ 11915  6.2.206  cannot use multi-byte characters as hotkey in console dialog
+  2189  6.2.207  with 'multi-byte' 'enc': expanding abbrev. replaces too much
+  4375  6.2.208  folding with markers sometimes doesn't work correctly
+  1853  6.2.209  using "P" in the middle of a closed fold messes up folds
+ 10479  6.2.210  (extra) Mac OSX: doesn't use antialiased fonts
+ 20317  6.2.211  (extra) handling files dropped on Vim doesn't use position
+  2458  6.2.212  (after 6.2.199) NetBeans: problem when replacing with a count
+  1834  6.2.213  (after 6.2.208) "{{{1" doesn't start a new fold when it should
+  1601  6.2.214  (extra, after 6.2.211) warning for unused variable
+
 
 
 Collection of patches for Vim 6.1:
diff --git a/spec.vim b/spec.vim
new file mode 100644
index 0000000..03fd48e
--- /dev/null
+++ b/spec.vim
@@ -0,0 +1,176 @@
+" Vim filetype plugin
+" Language:	spec file
+" Maintainer:	Guillaume Rousse <rousse@ccr.jussieu.fr>
+" URL:		http://lis.snv.jussieu.fr/~rousse/linux/spec.vim
+" Version:	$Id: spec.vim,v 1.1 2004/09/09 14:07:26 cvsdist Exp $
+
+if exists("b:did_ftplugin")
+	finish
+endif
+let b:did_ftplugin = 1
+
+" Add mappings, unless user doesn't want
+if !exists("no_plugin_maps") && !exists("no_spec_maps")
+	if !hasmapto("<Plug>AddChangelogBlock")
+		map <buffer> <LocalLeader>ch <Plug>AddChangelogBlock
+	endif
+	if !hasmapto("<Plug>AddChangelogEntry")
+		map <buffer> <LocalLeader>CH <Plug>AddChangelogEntry
+	endif
+	noremap <buffer> <unique> <script> <Plug>AddChangelogBlock :call <SID>AddChangelogBlock()<CR> 
+	noremap <buffer> <unique> <script> <Plug>AddChangelogEntry :call <SID>AddChangelogEntry()<CR>
+endif
+
+" compilation option
+setlocal makeprg=rpm\ -ba\ %
+setlocal errorformat=error:\ line\ %l:\ %m
+
+" navigation through sections
+let b:match_ignorecase = 0
+let b:match_words =
+	\ '^Name:^%description:^%clean:^%setup:^%build:^%install:^%files:' .
+	\ '^%package:^%preun:^%postun:^%changelog'
+
+if !exists("*s:AddChangelogBlock")
+	" Adds a changelog block
+	function s:AddChangelogBlock()
+		" look for changelog section
+		let line = <SID>GetFirstLocation(0, '^%changelog')
+		call <SID>InsertChangelogHeader(line)
+		call <SID>InsertChangelogEntry(line + 1)
+	endfunction
+endif
+
+if !exists("*s:AddChangelogEntry")
+	" Adds a changelog entry
+	function s:AddChangelogEntry()
+		" look for changelog section
+		let line = <SID>GetFirstLocation(0, '^%changelog')
+		" look for last entry
+		let line = <SID>GetLastLocation(line + 1, '^- ')
+		call <SID>InsertChangelogEntry(line)
+	endfunction
+endif
+
+if !exists("*s:InsertChangelogHeader")
+	" Insert a changelog header just after the given line
+	function s:InsertChangelogHeader(line)
+		" ensure english locale
+		language time C
+		" insert blank line first
+		call append(a:line, "")
+		" insert changelog header
+		call append(a:line,
+			\ "* " . strftime("%a %b %d %Y") . 
+			\ " " . <SID>GetTagValue("Packager") .
+			\ " " . <SID>GetTagValue("Version") .
+			\ "-" . <SID>GetTagValue("Release")
+			\)
+	endfunction
+endif
+
+if !exists("*s:InsertChangelogEntry")
+	" Insert a changelog entry just after the given line
+	function s:InsertChangelogEntry(line)
+		" insert changelog entry
+		call append(a:line, "- ")
+		" position cursor here
+		execute a:line
+		" enter insert mode
+		startinsert!
+	endfunction
+endif
+
+if !exists("*s:GetTagValue")
+	" Return value of a rpm tag
+	function s:GetTagValue(tag)
+		let pattern = '^' . a:tag . ':\s*'
+		let line = <SID>GetFirstLine(0, pattern)
+		let value = substitute(line, pattern, "", "")
+
+		" resolve macros
+		while (value =~ '%{\?\w\{3,}}\?')
+			let macro = matchstr(value, '%{\?\w\{3,}}\?')
+			let macro_name = substitute(macro, '%{\?\(\w\{3,}\)}\?', '\1', "")
+			let macro_value = <SID>GetMacroValue(macro_name)
+			let value = substitute(value, '%{\?' . macro_name . '}\?', macro_value, "")
+		endwhile
+		
+		" try to read externaly defined values
+		if (value == "")
+			let value = <SID>GetExternalMacroValue(a:tag)
+		endif
+
+		return value
+	endfunction
+endif
+
+if !exists("*s:GetMacroValue")
+	" Return value of a rpm macro
+	function s:GetMacroValue(macro)
+		let pattern = '^%define\s*' . a:macro . '\s*'
+		let line = <SID>GetFirstLine(0, pattern)
+		return substitute(line, pattern, "", "")
+	endfunction
+endif
+
+if !exists("*s:GetExternalMacroValue")
+	" Return value of an external rpm macro defined in $HOME/.rpmmacros
+	function s:GetExternalMacroValue(macro)
+		if filereadable($HOME . "/.rpmmacros")
+			let pattern = '^%' . tolower(a:macro) . '\s*'
+			let line = system("grep '" . pattern . "' $HOME/.rpmmacros")
+			" get rid of this !#&* trailing <NL>
+			let line = strpart(line, 0, strlen(line) - 1)
+			return substitute(line, pattern, "", "")
+		endif
+	endfunction
+endif
+
+if !exists("*s:GetFirstLocation")
+	" Return location of first line matching the given pattern after the given line
+	" Return -1 if not found at the end of the file
+	function s:GetFirstLocation(from, pattern)
+		let linenb = a:from
+		while (linenb <= line("$"))
+			let linenb = linenb + 1
+			let linestr = getline(linenb)
+			if (linestr =~ a:pattern)
+				return linenb
+			endif
+		endwhile
+		return -1
+	endfunction
+endif
+
+if !exists("*s:GetLastLocation")
+	" Return location of last line matching the given pattern after the given line
+	" Return -1 if still found at the end of the file
+	function s:GetLastLocation(from, pattern)
+		let linenb = a:from
+		while (linenb <= line("$"))
+			let linenb = linenb + 1
+			let linestr = getline(linenb)
+			if (linestr !~ a:pattern)
+				return linenb - 1
+			endif
+		endwhile
+		return -1
+	endfunction
+endif
+
+if !exists("*s:GetFirstLine")
+	" Return first line matching the given pattern after the given line
+	" Return "" if not found at the end of the file
+	function s:GetFirstLine(from, pattern)
+		let linenb = a:from
+		while (linenb <= line("$"))
+			let linenb = linenb + 1
+			let linestr = getline(linenb)
+			if (linestr =~ a:pattern)
+				return linestr
+			endif
+		endwhile
+		return ""
+	endfunction
+endif
diff --git a/vim-6.2-rh1.patch b/vim-6.2-rh1.patch
new file mode 100644
index 0000000..490f2d6
--- /dev/null
+++ b/vim-6.2-rh1.patch
@@ -0,0 +1,20 @@
+--- vim62/runtime/ftplugin/spec.vim.rh1	2004-01-12 14:16:15.000000000 +0100
++++ vim62/runtime/ftplugin/spec.vim	2004-01-12 14:18:06.000000000 +0100
+@@ -12,7 +12,7 @@
+ " Add mappings, unless user doesn't want
+ if !exists("no_plugin_maps") && !exists("no_spec_maps")
+ 	if !hasmapto("<Plug>AddChangelogBlock")
+-		map <buffer> <LocalLeader>ch <Plug>AddChangelogBlock
++		map <buffer> <LocalLeader>c <Plug>AddChangelogBlock
+ 	endif
+ 	if !hasmapto("<Plug>AddChangelogEntry")
+ 		map <buffer> <LocalLeader>CH <Plug>AddChangelogEntry
+@@ -62,7 +62,7 @@
+ 		" insert changelog header
+ 		call append(a:line,
+ 			\ "* " . strftime("%a %b %d %Y") . 
+-			\ " " . <SID>GetTagValue("Packager") .
++			\ " " . g:packager .
+ 			\ " " . <SID>GetTagValue("Version") .
+ 			\ "-" . <SID>GetTagValue("Release")
+ 			\)
diff --git a/vim-6.2-rh5.patch b/vim-6.2-rh5.patch
new file mode 100644
index 0000000..c5d3dba
--- /dev/null
+++ b/vim-6.2-rh5.patch
@@ -0,0 +1,11 @@
+--- vim62/runtime/syntax/fstab.vim.rh5	2003-11-10 22:52:23.000000000 +0100
++++ vim62/runtime/syntax/fstab.vim	2003-11-10 22:55:09.000000000 +0100
+@@ -44,7 +44,7 @@
+ syn keyword fsOptionsYesNo yes no
+ syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
+ syn keyword fsOptionsSize 512 1024 2048
+-syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount
++syn keyword fsOptionsGeneral async atime auto current defaults dev exec force fstab noatime noauto noclusterr noclusterw nodev noexec nosuid nosymfollow nouser owner ro rdonly rw rq sw xx suid suiddir sync kudzu union update user supermount users loop
+ syn match fsOptionsGeneral /_netdev/
+ 
+ " Options: adfs
diff --git a/vim-selinux.patch b/vim-selinux.patch
new file mode 100644
index 0000000..7d543a1
--- /dev/null
+++ b/vim-selinux.patch
@@ -0,0 +1,142 @@
+--- vim62/src/configure.in.selinux	2004-01-20 11:34:17.177103792 -0500
++++ vim62/src/configure.in	2004-01-20 11:34:18.507126105 -0500
+@@ -195,6 +195,20 @@
+ fi
+ 
+ 
++dnl vim: set sw=2 tw=78 fo+=l:
++dnl Link with -lselinux for SELinux stuff; if not found
++AC_MSG_CHECKING(--disable-selinux argument)
++AC_ARG_ENABLE(selinux,
++	[  --disable-selinux	  Don't check for SELinux support.],
++	, [enable_selinux="yes"])
++if test "$enable_selinux" = "yes"; then
++   AC_MSG_RESULT(no)
++   AC_CHECK_LIB(selinux, is_selinux_enabled, [LIBS="$LIBS -lselinux"])
++   AC_DEFINE(HAVE_SELINUX)
++else
++   AC_MSG_RESULT(yes)
++fi
++
+ dnl Check user requested features.
+ 
+ AC_MSG_CHECKING(--with-features argument)
+--- vim62/src/config.h.in.selinux	2003-05-25 12:07:42.000000000 -0400
++++ vim62/src/config.h.in	2004-01-20 11:34:18.507126105 -0500
+@@ -155,6 +155,7 @@
+ #undef HAVE_READLINK
+ #undef HAVE_RENAME
+ #undef HAVE_SELECT
++#undef HAVE_SELINUX
+ #undef HAVE_SETENV
+ #undef HAVE_SETPGID
+ #undef HAVE_SETSID
+--- vim62/src/fileio.c.selinux	2004-01-20 11:34:16.577093725 -0500
++++ vim62/src/fileio.c	2004-01-20 11:34:18.517126273 -0500
+@@ -1,3 +1,4 @@
++
+ /* vi:set ts=8 sts=4 sw=4:
+  *
+  * VIM - Vi IMproved	by Bram Moolenaar
+@@ -3079,6 +3080,9 @@
+ 						)
+ 			    mch_setperm(backup,
+ 					  (perm & 0707) | ((perm & 07) << 3));
++#ifdef HAVE_SELINUX
++			mch_copy_sec(backup, fname);
++#endif
+ #endif
+ 
+ 			/*
+@@ -3115,6 +3119,9 @@
+ #ifdef HAVE_ACL
+ 			mch_set_acl(backup, acl);
+ #endif
++#ifdef HAVE_SELINUX
++			mch_copy_sec(backup,fname);
++#endif
+ 			break;
+ 		    }
+ 		}
+@@ -3719,6 +3726,12 @@
+ 	mch_set_acl(wfname, acl);
+ #endif
+ 
++#ifdef HAVE_SELINUX
++    /* Probably need to set the security context */
++    if (!backup_copy)
++	mch_copy_sec(backup, wfname);
++#endif
++
+ #ifdef UNIX
+     /* When creating a new file, set its owner/group to that of the original
+      * file.  Get the new device and inode number. */
+--- vim62/src/os_unix.c.selinux	2004-01-20 11:34:15.897082317 -0500
++++ vim62/src/os_unix.c	2004-01-20 11:37:54.310746614 -0500
+@@ -41,6 +41,10 @@
+ # include <X11/SM/SMlib.h>
+ #endif
+ 
++#ifdef HAVE_SELINUX
++#include <selinux/selinux.h>
++static int selinux_enabled=-1;
++#endif
+ /*
+  * Use this prototype for select, some include files have a wrong prototype
+  */
+@@ -2279,6 +2283,55 @@
+ } vim_acl_solaris_T;
+ # endif
+ 
++mch_copy_sec(from_file, to_file)
++     char_u	*from_file;
++     char_u	*to_file;
++{
++  if (from_file == NULL)
++    return;
++  
++#ifdef HAVE_SELINUX
++  if (selinux_enabled == -1)
++    selinux_enabled = is_selinux_enabled ();
++
++  if (selinux_enabled>0)
++    {
++      security_context_t from_context=NULL;
++      security_context_t to_context=NULL;
++      if (getfilecon (from_file, &from_context) < 0)
++	{
++	  /* If the filesystem doesn't support extended attributes,
++	     the original had no special security context and the
++	     target cannot have one either.  */
++	  if (errno == EOPNOTSUPP)
++	    return ;
++	  
++	  MSG_PUTS(_("\nCould not get security context for "));
++	  msg_outtrans(from_file);
++	  msg_putchar('\n');
++	  return ;
++	}
++      if (getfilecon (to_file, &to_context) < 0)
++	{
++	  MSG_PUTS(_("\nCould not get security context for "));
++	  msg_outtrans(to_file);
++	  msg_putchar('\n');
++	  freecon (from_context);
++	  return ;
++	}
++      if (strcmp(from_context,to_context) != 0 ) {
++	if (setfilecon (to_file, from_context) < 0)
++	  {
++	    MSG_PUTS(_("\nCould not set security context for "));
++	    msg_outtrans(to_file);
++	    msg_putchar('\n');
++	  }
++      }
++      freecon (to_context);
++      freecon (from_context);
++    }
++#endif /* HAVE_SELINUX */
++}
+ /*
+  * Return a pointer to the ACL of file "fname" in allocated memory.
+  * Return NULL if the ACL is not available for whatever reason.
diff --git a/vim.spec b/vim.spec
index 288b34b..49b1124 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,3 +1,4 @@
+%define WITH_SELINUX 1
 %define desktop_file 1
 %if %{desktop_file}
 %define desktop_file_utils_version 0.2.93
@@ -22,7 +23,7 @@
 
 %define baseversion 6.2
 %define vimdir vim62
-%define patchlevel 121
+%define patchlevel 214
 
 Summary: The VIM editor.
 Name: vim
@@ -36,6 +37,7 @@ Source2: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}-extra.tar.gz
 Source3: gvim.desktop
 Source4: vimrc
 Source5: ftp://ftp.vim.org/pub/vim/patches/README.patches
+Source6: spec.vim
 Patch2000: vim-4.2-speed_t.patch
 Patch2001: vim-5.1-vimnotvi.patch
 Patch2002: vim-5.6a-paths.patch
@@ -167,13 +169,114 @@ Patch118: ftp://ftp.vim.org/pub/vim/patches/6.2.118
 Patch119: ftp://ftp.vim.org/pub/vim/patches/6.2.119
 Patch120: ftp://ftp.vim.org/pub/vim/patches/6.2.120
 Patch121: ftp://ftp.vim.org/pub/vim/patches/6.2.121
+Patch122: ftp://ftp.vim.org/pub/vim/patches/6.2.122
+Patch123: ftp://ftp.vim.org/pub/vim/patches/6.2.123
+Patch124: ftp://ftp.vim.org/pub/vim/patches/6.2.124
+Patch125: ftp://ftp.vim.org/pub/vim/patches/6.2.125
+Patch126: ftp://ftp.vim.org/pub/vim/patches/6.2.126
+Patch127: ftp://ftp.vim.org/pub/vim/patches/6.2.127
+Patch128: ftp://ftp.vim.org/pub/vim/patches/6.2.128
+Patch129: ftp://ftp.vim.org/pub/vim/patches/6.2.129
+Patch130: ftp://ftp.vim.org/pub/vim/patches/6.2.130
+Patch131: ftp://ftp.vim.org/pub/vim/patches/6.2.131
+Patch132: ftp://ftp.vim.org/pub/vim/patches/6.2.132
+Patch133: ftp://ftp.vim.org/pub/vim/patches/6.2.133
+Patch134: ftp://ftp.vim.org/pub/vim/patches/6.2.134
+Patch135: ftp://ftp.vim.org/pub/vim/patches/6.2.135
+Patch136: ftp://ftp.vim.org/pub/vim/patches/6.2.136
+Patch137: ftp://ftp.vim.org/pub/vim/patches/6.2.137
+Patch138: ftp://ftp.vim.org/pub/vim/patches/6.2.138
+Patch139: ftp://ftp.vim.org/pub/vim/patches/6.2.139
+Patch140: ftp://ftp.vim.org/pub/vim/patches/6.2.140
+Patch141: ftp://ftp.vim.org/pub/vim/patches/6.2.141
+Patch142: ftp://ftp.vim.org/pub/vim/patches/6.2.142
+Patch143: ftp://ftp.vim.org/pub/vim/patches/6.2.143
+Patch144: ftp://ftp.vim.org/pub/vim/patches/6.2.144
+Patch145: ftp://ftp.vim.org/pub/vim/patches/6.2.145
+Patch146: ftp://ftp.vim.org/pub/vim/patches/6.2.146
+Patch147: ftp://ftp.vim.org/pub/vim/patches/6.2.147
+Patch148: ftp://ftp.vim.org/pub/vim/patches/6.2.148
+Patch149: ftp://ftp.vim.org/pub/vim/patches/6.2.149
+Patch150: ftp://ftp.vim.org/pub/vim/patches/6.2.150
+Patch151: ftp://ftp.vim.org/pub/vim/patches/6.2.151
+Patch152: ftp://ftp.vim.org/pub/vim/patches/6.2.152
+Patch153: ftp://ftp.vim.org/pub/vim/patches/6.2.153
+Patch154: ftp://ftp.vim.org/pub/vim/patches/6.2.154
+Patch155: ftp://ftp.vim.org/pub/vim/patches/6.2.155
+Patch156: ftp://ftp.vim.org/pub/vim/patches/6.2.156
+Patch157: ftp://ftp.vim.org/pub/vim/patches/6.2.157
+Patch158: ftp://ftp.vim.org/pub/vim/patches/6.2.158
+Patch159: ftp://ftp.vim.org/pub/vim/patches/6.2.159
+Patch160: ftp://ftp.vim.org/pub/vim/patches/6.2.160
+Patch161: ftp://ftp.vim.org/pub/vim/patches/6.2.161
+Patch162: ftp://ftp.vim.org/pub/vim/patches/6.2.162
+Patch163: ftp://ftp.vim.org/pub/vim/patches/6.2.163
+Patch164: ftp://ftp.vim.org/pub/vim/patches/6.2.164
+Patch165: ftp://ftp.vim.org/pub/vim/patches/6.2.165
+Patch166: ftp://ftp.vim.org/pub/vim/patches/6.2.166
+Patch167: ftp://ftp.vim.org/pub/vim/patches/6.2.167
+Patch168: ftp://ftp.vim.org/pub/vim/patches/6.2.168
+Patch169: ftp://ftp.vim.org/pub/vim/patches/6.2.169
+Patch170: ftp://ftp.vim.org/pub/vim/patches/6.2.170
+Patch171: ftp://ftp.vim.org/pub/vim/patches/6.2.171
+Patch172: ftp://ftp.vim.org/pub/vim/patches/6.2.172
+Patch173: ftp://ftp.vim.org/pub/vim/patches/6.2.173
+Patch174: ftp://ftp.vim.org/pub/vim/patches/6.2.174
+Patch175: ftp://ftp.vim.org/pub/vim/patches/6.2.175
+Patch176: ftp://ftp.vim.org/pub/vim/patches/6.2.176
+Patch177: ftp://ftp.vim.org/pub/vim/patches/6.2.177
+Patch178: ftp://ftp.vim.org/pub/vim/patches/6.2.178
+Patch179: ftp://ftp.vim.org/pub/vim/patches/6.2.179
+Patch180: ftp://ftp.vim.org/pub/vim/patches/6.2.180
+Patch181: ftp://ftp.vim.org/pub/vim/patches/6.2.181
+Patch182: ftp://ftp.vim.org/pub/vim/patches/6.2.182
+Patch183: ftp://ftp.vim.org/pub/vim/patches/6.2.183
+Patch184: ftp://ftp.vim.org/pub/vim/patches/6.2.184
+Patch185: ftp://ftp.vim.org/pub/vim/patches/6.2.185
+Patch186: ftp://ftp.vim.org/pub/vim/patches/6.2.186
+Patch187: ftp://ftp.vim.org/pub/vim/patches/6.2.187
+Patch188: ftp://ftp.vim.org/pub/vim/patches/6.2.188
+Patch189: ftp://ftp.vim.org/pub/vim/patches/6.2.189
+Patch190: ftp://ftp.vim.org/pub/vim/patches/6.2.190
+Patch191: ftp://ftp.vim.org/pub/vim/patches/6.2.191
+Patch192: ftp://ftp.vim.org/pub/vim/patches/6.2.192
+Patch193: ftp://ftp.vim.org/pub/vim/patches/6.2.193
+Patch194: ftp://ftp.vim.org/pub/vim/patches/6.2.194
+Patch195: ftp://ftp.vim.org/pub/vim/patches/6.2.195
+Patch196: ftp://ftp.vim.org/pub/vim/patches/6.2.196
+Patch197: ftp://ftp.vim.org/pub/vim/patches/6.2.197
+Patch198: ftp://ftp.vim.org/pub/vim/patches/6.2.198
+Patch199: ftp://ftp.vim.org/pub/vim/patches/6.2.199
+Patch200: ftp://ftp.vim.org/pub/vim/patches/6.2.200
+Patch201: ftp://ftp.vim.org/pub/vim/patches/6.2.201
+Patch202: ftp://ftp.vim.org/pub/vim/patches/6.2.202
+Patch203: ftp://ftp.vim.org/pub/vim/patches/6.2.203
+Patch204: ftp://ftp.vim.org/pub/vim/patches/6.2.204
+Patch205: ftp://ftp.vim.org/pub/vim/patches/6.2.205
+Patch206: ftp://ftp.vim.org/pub/vim/patches/6.2.206
+Patch207: ftp://ftp.vim.org/pub/vim/patches/6.2.207
+Patch208: ftp://ftp.vim.org/pub/vim/patches/6.2.208
+Patch209: ftp://ftp.vim.org/pub/vim/patches/6.2.209
+Patch210: ftp://ftp.vim.org/pub/vim/patches/6.2.210
+Patch211: ftp://ftp.vim.org/pub/vim/patches/6.2.211
+Patch212: ftp://ftp.vim.org/pub/vim/patches/6.2.212
+Patch213: ftp://ftp.vim.org/pub/vim/patches/6.2.213
+Patch214: ftp://ftp.vim.org/pub/vim/patches/6.2.214
 
 Patch3001: vim-6.1-syntax.patch
-Patch3002: vim-6.1-rh1.patch
+Patch3002: vim-6.2-rh1.patch
 Patch3003: vim-6.1-rh2.patch
 Patch3004: vim-6.1-rh3.patch
 Patch3005: vim-6.2-rclocation.patch
 Patch3006: vim-6.2-rh4.patch
+Patch3007: vim-6.2-rh5.patch
+Patch3008: vim-6.2-perlthread.patch
+Patch3009: vim-6.2-shsyntax.patch
+
+Patch3100: vim-6.2-runtimeupdate.patch
+
+Patch3101: vim-selinux.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Buildrequires: python-devel perl libtermcap-devel gettext
 %if "%{withruby}" == "1"
@@ -184,8 +287,6 @@ Requires: /usr/bin/desktop-file-install
 BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
 %endif
 Epoch: 1
-# remove this when we have ruby and python-devel on ppc64:
-ExcludeArch: ppc64
 
 %description
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -205,13 +306,12 @@ multiple windows, multi-level undo, block highlighting and more.  The
 vim-common package contains files which every VIM binary will need in
 order to run.
 
-If you are installing any version of the VIM editor, you'll also need
-to the vim-common package installed.
+If you are installing vim-enhanced or vim-X11, you'll also need
+to install the vim-common package.
 
 %package minimal
 Summary: A minimal version of the VIM editor.
 Group: Applications/Editors
-Requires: vim-common
 Obsoletes:  vim
 
 %description minimal
@@ -221,12 +321,14 @@ still very popular.  VIM improves on vi by adding new features:
 multiple windows, multi-level undo, block highlighting and more. The
 vim-minimal package includes a minimal version of VIM, which is
 installed into /bin/vi for use when only the root partition is
-present.
+present. NOTE: The online help is only available when the vim-common
+package is installed.
 
 %package enhanced
 Summary: A version of the VIM editor which includes recent enhancements.
 Group: Applications/Editors
-Requires: vim-common
+Requires: vim-common 
+Requires:  %(perl -le 'use Config;print $Config{archlibexp}')
 Obsoletes: vim-color
 
 %description enhanced
@@ -246,7 +348,7 @@ need to install the vim-common package.
 %package X11
 Summary: The VIM version of the vi editor for the X Window System.
 Group: Applications/Editors
-Requires: vim-common
+Requires: vim-common libattr
 %if "%{withgtk2}" == "1"
 BuildRequires: gtk2-devel
 %else
@@ -269,8 +371,9 @@ vim-common package.
 
 %prep
 %setup -q -b 1 -n %{vimdir}
+cp -f %{SOURCE6} runtime/ftplugin/spec.vim
 %patch2000 -p1 -b .4.2
-%patch2001 -p1 -b .vim
+# %patch2001 -p1 -b .vim
 # fix rogue dependencies from sample code
 chmod -x runtime/tools/mve.awk
 %patch2002 -p1 -b .paths
@@ -381,29 +484,123 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 # %patch096 -p0 # Win32
 %patch097 -p0
 %patch098 -p0
-%patch099 -p0 -b .pl099
-%patch100 -p0 -b .pl100
-%patch101 -p0 -b .pl101
-%patch102 -p0 -b .pl102
+%patch099 -p0
+%patch100 -p0
+%patch101 -p0
+%patch102 -p0
 # %patch103 -p0 # Mac
-%patch104 -p0 -b .pl104
-%patch105 -p0 -b .pl105
-%patch106 -p0 -b .pl106
+%patch104 -p0
+%patch105 -p0
+%patch106 -p0
 # %patch107 -p0 # Win32
-%patch108 -p0 -b .pl108
-%patch109 -p0 -b .pl109
-%patch110 -p0 -b .pl110
-%patch111 -p0 -b .pl111
-%patch112 -p0 -b .pl112
-%patch113 -p0 -b .pl113
-%patch114 -p0 -b .pl114
+%patch108 -p0
+%patch109 -p0
+%patch110 -p0
+%patch111 -p0
+%patch112 -p0
+%patch113 -p0
+%patch114 -p0
 # %patch115 -p0 # Amiga
 # %patch116 -p0 # Win
-%patch117 -p0 -b .pl117
+%patch117 -p0
 # %patch118 -p0 # Mac
 # %patch119 -p0 # Win
-%patch120 -p0 -b .pl120
+%patch120 -p0
 # %patch121 -p0 # Mac
+# %patch122 -p0 # Mac
+# %patch123 -p0 # Mac
+# %patch124 -p0 # Mac
+# %patch125 -p0 # Win32
+# %patch126 -p0 # Win32
+#%patch127 -p0 # Win32
+# %patch128 -p0 # Mac
+%patch129 -p0
+# %patch130 -p0 # Win32
+# %patch131 -p0 # Win32
+# %patch132 -p0 # Win32
+%patch133 -p0
+# %patch134 -p0 # Win32
+%patch135 -p0
+%patch136 -p0
+%patch137 -p0
+# %patch138 -p0 # VMS
+%patch139 -p0
+# %patch140 -p0 # Mac
+# %patch141 -p0 # Mac
+# %patch142 -p0 # Mac
+%patch143 -p0
+%patch144 -p0
+%patch145 -p0
+%patch146 -p0
+%patch147 -p0
+%patch148 -p0
+%patch149 -p0
+%patch150 -p0
+%patch151 -p0
+%patch152 -p0
+#%patch153 -p0 # Win32
+%patch154 -p0
+#%patch155 -p0 # Win32
+#%patch156 -p0 # Win32
+%patch157 -p0
+%patch158 -p0
+%patch159 -p0
+%patch160 -p0
+#%patch161 -p0 # VMS
+%patch162 -p0
+%patch163 -p0
+%patch164 -p0
+%patch165 -p0
+%patch166 -p0
+%patch167 -p0
+%patch168 -p0
+%patch169 -p0
+%patch170 -p0
+%patch171 -p0
+%patch172 -p0
+#%patch173 -p0 # Win32
+%patch174 -p0
+%patch175 -p0
+%patch176 -p0
+#%patch177 -p0 # VisVim
+%patch178 -p0
+%patch179 -p0
+#%patch180 -p0 # Win32
+%patch181 -p0
+%patch182 -p0
+%patch183 -p0
+%patch184 -p0
+%patch185 -p0
+%patch186 -p0
+%patch187 -p0
+#%patch188 -p0 # Win32
+%patch189 -p0
+%patch190 -p0
+%patch191 -p0
+%patch192 -p0
+%patch193 -p0
+#%patch194 -p0 # Netbeans stuff doesn't apply
+%patch195 -p0
+%patch196 -p0
+%patch197 -p0
+%patch198 -p0
+#%patch199 -p0 # NetBeans
+%patch200 -p0
+%patch201 -p0
+%patch202 -p0
+%patch203 -p0
+%patch204 -p0
+#%patch205 -p0 # Win32
+%patch206 -p0
+%patch207 -p0
+%patch208 -p0
+%patch209 -p0
+#%patch210 -p0 # MacOSX
+# Modified patch! Mac and W48 stuff deleted:
+%patch211 -p0
+#%patch212 # NetBeans
+%patch213 -p0
+#%patch214 -p0 # w48
 
 #%patch3000 -p1 -b .kh1
 %patch3001 -p1 -b .syntx
@@ -412,9 +609,19 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3004 -p1 -b .rh3
 %patch3005 -p1 -b .rcloc
 %patch3006 -p1 -b .rh4
+%patch3007 -p1 -b .rh5
+%patch3008 -p1 -b .perlthread
+%patch3009 -p1 -b .stx
+
+%patch3100 -p1
+
+%if %{WITH_SELINUX}
+%patch3101 -p1 -b .selinux
+%endif
 
 %build
 cd src
+autoconf
 perl -pi -e "s,\\\$VIMRUNTIME,/usr/share/vim/%{vimdir},g" os_unix.h
 perl -pi -e "s,\\\$VIM,/usr/share/vim/%{vimdir}/macros,g" os_unix.h
 
@@ -613,6 +820,63 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Jan 29 2004 Karsten Hopp <karsten@redhat.de> 6.2.214-1 
+- Patchlevel 214
+
+* Mon Jan 26 2004 Dan Walsh <dwalsh@redhat.com> 1:6.2.195-5
+- Fix call to is_selinux_enabled()
+
+* Sat Jan 24 2004 Karsten Hopp <karsten@redhat.de> 6.2.195-4
+- fix perl requirement
+
+* Fri Jan 23 2004 Dan Walsh <dwalsh@redhat.com> 1:6.2.195-3
+- Only attempt to change context if it is different
+
+* Thu Jan 22 2004 Karsten Hopp <karsten@redhat.de> 6.2.195-1
+- update to patchlevel 195
+- enable ppc64 build
+
+* Mon Jan 12 2004 Karsten Hopp <karsten@redhat.de> 6.2.180-2 
+- vim-enhanced requires perl >= 5.8.2 (#111592)
+
+* Mon Jan 12 2004 Karsten Hopp <karsten@redhat.de> 6.2.180-1 
+- Patchlevel 180
+- update spec.vim, use g:packager instead of {Packager} macro
+
+* Tue Jan 6 2004 Dan Walsh <dwalsh@redhat.com> 1:6.2.154-7
+- Enable selinux support for vim-minimal
+
+* Wed Dec 17 2003 Dan Walsh <dwalsh@redhat.com> 1:6.2.154-6
+- Enable selinux support
+
+* Thu Dec 04 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.154-5
+- rebuild with new perl
+
+* Wed Dec 03 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.154-4
+- fix sh.vim syntax file (#104312)
+
+* Tue Dec 02 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.154-3
+- perl interface was disabled when perl had thread support.
+
+* Thu Nov 27 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.154-2
+- fix date in specfile changelog entries
+
+* Thu Nov 13 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.154-1
+- Patchlevel 154
+- vim-minimal doesn't really require vim-common to run, removed dependency
+  (#109819)
+
+* Mon Nov 10 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.149-1
+- Patchlevel 149
+- fix fstab syntax file (Robert G. (Doc) Savage)
+- lots of updates for syntax files, macros, documentation
+- disable vimnotvi patch so that vim's behaviour matches documentation
+- clean up vimrc
+
+* Thu Nov 06 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.145-1
+- rebuild with new Python
+- Patchlevel 145
+
 * Tue Oct 14 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.121-1
 - patchlevel 121
 - fix buildrequires (#106824, #105832)
diff --git a/vimrc b/vimrc
index 79a1b19..5125639 100644
--- a/vimrc
+++ b/vimrc
@@ -1,16 +1,3 @@
-if v:lang =~ "^ko"
-   set fileencodings=euc-kr
-   set guifontset=-*-*-medium-r-normal--16-*-*-*-*-*-*-*
-elseif v:lang =~ "^ja_JP"
-   set fileencodings=euc-jp
-   set guifontset=-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*
-elseif v:lang =~ "^zh_TW"
-   set fileencodings=big5
-   set guifontset=-sony-fixed-medium-r-normal--16-150-75-75-c-80-iso8859-1,-taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0
-elseif v:lang =~ "^zh_CN"
-   set fileencodings=gb2312
-   set guifontset=*-r-*
-endif
 if v:lang =~ "utf8$" || v:lang =~ "UTF-8$"
    set fileencodings=utf-8,latin1
 endif
@@ -35,9 +22,6 @@ if has("autocmd")
   \ endif
 endif
 
-" Don't use Ex mode, use Q for formatting
-map Q gq
-
 " 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")
@@ -50,20 +34,3 @@ if &term=="xterm"
      set t_Sb=^[4%dm
      set t_Sf=^[3%dm
 endif
-
-" some extra commands for HTML editing
-nmap ,mh wbgueyei<<ESC>ea></<ESC>pa><ESC>bba
-nmap ,h1 _i<h1><ESC>A</h1><ESC>
-nmap ,h2 _i<h2><ESC>A</h2><ESC>
-nmap ,h3 _i<h3><ESC>A</h3><ESC>
-nmap ,h4 _i<h4><ESC>A</h4><ESC>
-nmap ,h5 _i<h5><ESC>A</h5><ESC>
-nmap ,h6 _i<h6><ESC>A</h6><ESC>
-nmap ,hb wbi<b><ESC>ea</b><ESC>bb
-nmap ,he wbi<em><ESC>ea</em><ESC>bb
-nmap ,hi wbi<i><ESC>ea</i><ESC>bb
-nmap ,hu wbi<u><ESC>ea</i><ESC>bb
-nmap ,hs wbi<strong><ESC>ea</strong><ESC>bb
-nmap ,ht wbi<tt><ESC>ea</tt><ESC>bb
-nmap ,hx wbF<df>f<df>
-