- patchlevel 191

- clean up spec file for rpmlint
- drop cvim stuff

7.0.189

@@ -0,0 +1,72 @@
+To: vim-dev@vim.org
+Subject: patch 7.0.189
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.189
+Problem:    Translated message about finding matches is truncated.  (Yukihiro
+            Nakadaira)
+Solution:   Enlarge the buffer.  Also use vim_snprintf().
+Files:      src/edit.c
+
+
+*** ../vim-7.0.188/src/edit.c	Wed Nov  1 21:24:58 2006
+--- src/edit.c	Fri Jan 19 20:22:09 2007
+***************
+*** 4970,4985 ****
+  	     * just a safety check. */
+  	    if (compl_curr_match->cp_number != -1)
+  	    {
+! 		/* Space for 10 text chars. + 2x10-digit no.s */
+! 		static char_u match_ref[31];
+  
+  		if (compl_matches > 0)
+! 		    sprintf((char *)IObuff, _("match %d of %d"),
+  				compl_curr_match->cp_number, compl_matches);
+  		else
+! 		    sprintf((char *)IObuff, _("match %d"),
+! 						 compl_curr_match->cp_number);
+! 		vim_strncpy(match_ref, IObuff, 30);
+  		edit_submode_extra = match_ref;
+  		edit_submode_highl = HLF_R;
+  		if (dollar_vcol)
+--- 4970,4987 ----
+  	     * just a safety check. */
+  	    if (compl_curr_match->cp_number != -1)
+  	    {
+! 		/* Space for 10 text chars. + 2x10-digit no.s = 31.
+! 		 * Translations may need more than twice that. */
+! 		static char_u match_ref[81];
+  
+  		if (compl_matches > 0)
+! 		    vim_snprintf((char *)match_ref, sizeof(match_ref),
+! 				_("match %d of %d"),
+  				compl_curr_match->cp_number, compl_matches);
+  		else
+! 		    vim_snprintf((char *)match_ref, sizeof(match_ref),
+! 				_("match %d"),
+! 				compl_curr_match->cp_number);
+  		edit_submode_extra = match_ref;
+  		edit_submode_highl = HLF_R;
+  		if (dollar_vcol)
+*** ../vim-7.0.188/src/version.c	Tue Jan 16 22:13:53 2007
+--- src/version.c	Sun Feb  4 02:35:43 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     189,
+  /**/
+
+-- 
+How many light bulbs does it take to change a person?
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

7.0.190

@@ -0,0 +1,52 @@
+To: vim-dev@vim.org
+Subject: patch 7.0.190
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.190
+Problem:    "syntax spell default" results in an error message.
+Solution:   Change 4 to 7 for STRNICMP(). (Raul Nunez de Arenas Coronado)
+Files:      src/syntax.c
+    
+
+*** ../vim-7.0.189/src/syntax.c	Wed Nov  1 12:43:07 2006
+--- src/syntax.c	Sun Jan 21 13:12:19 2007
+***************
+*** 3206,3212 ****
+  	curbuf->b_syn_spell = SYNSPL_TOP;
+      else if (STRNICMP(arg, "notoplevel", 10) == 0 && next - arg == 10)
+  	curbuf->b_syn_spell = SYNSPL_NOTOP;
+!     else if (STRNICMP(arg, "default", 4) == 0 && next - arg == 4)
+  	curbuf->b_syn_spell = SYNSPL_DEFAULT;
+      else
+  	EMSG2(_("E390: Illegal argument: %s"), arg);
+--- 3206,3212 ----
+  	curbuf->b_syn_spell = SYNSPL_TOP;
+      else if (STRNICMP(arg, "notoplevel", 10) == 0 && next - arg == 10)
+  	curbuf->b_syn_spell = SYNSPL_NOTOP;
+!     else if (STRNICMP(arg, "default", 7) == 0 && next - arg == 7)
+  	curbuf->b_syn_spell = SYNSPL_DEFAULT;
+      else
+  	EMSG2(_("E390: Illegal argument: %s"), arg);
+*** ../vim-7.0.189/src/version.c	Sun Feb  4 02:37:40 2007
+--- src/version.c	Sun Feb  4 02:40:23 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     190,
+  /**/
+
+-- 
+From "know your smileys":
+ :-)-O	Smiling doctor with stethoscope
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

7.0.191

@@ -0,0 +1,220 @@
+# KH: modified, as one line was already in the runtime update patch
+To: vim-dev@vim.org
+Subject: patch 7.0.191
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.191 
+Problem:    The items used by getqflist() and setqflist() don't match.
+Solution:   Support the "bufnum" item for setqflist(). (Yegappan Lakshmanan)
+Files:      runtime/doc/eval.txt, src/quickfix.c
+
+
+--- runtime/doc/eval.txt.191	2007-02-06 06:18:06.000000000 -0500
++++ runtime/doc/eval.txt	2007-02-06 06:20:52.000000000 -0500
+@@ -2914,7 +2914,8 @@
+ 			valid	non-zero: recognized error message
+ 
+ 		When there is no error list or it's empty an empty list is
+-		returned.
++		returned. Quickfix list entries with non-existing buffer
++		number are returned with "bufnr" set to zero.
+ 
+ 		Useful application: Find pattern matches in multiple files and
+ 		do something with them: >
+@@ -4392,7 +4393,10 @@
+ 		Non-dictionary items in {list} are ignored.  Each dictionary
+ 		item can contain the following entries:
+ 
+-		    filename	name of a file
++		    bufnr	buffer number; must be the number of a valid
++		    		buffer
++		    filename	name of a file; only used when "bufnr" is not
++		    		present or it is invalid.
+ 		    lnum	line number in the file
+ 		    pattern	search pattern used to locate the error
+ 		    col		column number
+@@ -4405,11 +4409,13 @@
+ 		The "col", "vcol", "nr", "type" and "text" entries are
+ 		optional.  Either "lnum" or "pattern" entry can be used to
+ 		locate a matching error line.
+-		If the "filename" entry is not present or neither the "lnum"
+-		or "pattern" entries are present, then the item will not be
+-		handled as an error line.
++		If the "filename" and "bufnr" entries are not present or
++		neither the "lnum" or "pattern" entries are present, then the
++		item will not be handled as an error line.
+ 		If both "pattern" and "lnum" are present then "pattern" will
+ 		be used.
++		Note that the list is not exactly the same as what
++		|getqflist()| returns.
+ 
+ 		If {action} is set to 'a', then the items from {list} are
+ 		added to the existing quickfix list. If there is no existing
+--- src/quickfix.c.191	2007-02-06 06:18:06.000000000 -0500
++++ src/quickfix.c	2007-02-06 06:18:06.000000000 -0500
+@@ -106,7 +106,7 @@
+ 
+ static int	qf_init_ext __ARGS((qf_info_T *qi, char_u *efile, buf_T *buf, typval_T *tv, char_u *errorformat, int newlist, linenr_T lnumfirst, linenr_T lnumlast));
+ static void	qf_new_list __ARGS((qf_info_T *qi));
+-static int	qf_add_entry __ARGS((qf_info_T *qi, qfline_T **prevp, char_u *dir, char_u *fname, char_u *mesg, long lnum, int col, int vis_col, char_u *pattern, int nr, int type, int valid));
++static int	qf_add_entry __ARGS((qf_info_T *qi, qfline_T **prevp, char_u *dir, char_u *fname, int bufnum, char_u *mesg, long lnum, int col, int vis_col, char_u *pattern, int nr, int type, int valid));
+ static void	qf_msg __ARGS((qf_info_T *qi));
+ static void	qf_free __ARGS((qf_info_T *qi, int idx));
+ static char_u	*qf_types __ARGS((int, int));
+@@ -791,6 +791,7 @@
+ 			(*namebuf || directory)
+ 			    ? namebuf
+ 			    : ((currfile && valid) ? currfile : (char_u *)NULL),
++			0,
+ 			errmsg,
+ 			lnum,
+ 			col,
+@@ -936,12 +937,13 @@
+  * Returns OK or FAIL.
+  */
+     static int
+-qf_add_entry(qi, prevp, dir, fname, mesg, lnum, col, vis_col, pattern, nr, type,
+-	     valid)
++qf_add_entry(qi, prevp, dir, fname, bufnum, mesg, lnum, col, vis_col, pattern,
++	     nr, type, valid)
+     qf_info_T	*qi;		/* quickfix list */
+     qfline_T	**prevp;	/* pointer to previously added entry or NULL */
+     char_u	*dir;		/* optional directory name */
+     char_u	*fname;		/* file name or NULL */
++    int		bufnum;		/* buffer number or zero */
+     char_u	*mesg;		/* message */
+     long	lnum;		/* line number */
+     int		col;		/* column */
+@@ -955,7 +957,10 @@
+ 
+     if ((qfp = (qfline_T *)alloc((unsigned)sizeof(qfline_T))) == NULL)
+ 	return FAIL;
+-    qfp->qf_fnum = qf_get_fnum(dir, fname);
++    if (bufnum != 0)
++	qfp->qf_fnum = bufnum;
++    else
++	qfp->qf_fnum = qf_get_fnum(dir, fname);
+     if ((qfp->qf_text = vim_strsave(mesg)) == NULL)
+     {
+ 	vim_free(qfp);
+@@ -1106,6 +1111,7 @@
+ 		if (qf_add_entry(to->w_llist, &prevp,
+ 				 NULL,
+ 				 NULL,
++				 0,
+ 				 from_qfp->qf_text,
+ 				 from_qfp->qf_lnum,
+ 				 from_qfp->qf_col,
+@@ -3134,6 +3140,7 @@
+ 		    if (qf_add_entry(qi, &prevp,
+ 				NULL,       /* dir */
+ 				fnames[fi],
++				0,
+ 				ml_get_buf(buf,
+ 				     regmatch.startpos[0].lnum + lnum, FALSE),
+ 				regmatch.startpos[0].lnum + lnum,
+@@ -3419,6 +3426,7 @@
+     char_u	buf[2];
+     qfline_T	*qfp;
+     int		i;
++    int		bufnum;
+ 
+     if (wp != NULL)
+     {
+@@ -3434,6 +3442,11 @@
+     qfp = qi->qf_lists[qi->qf_curlist].qf_start;
+     for (i = 1; !got_int && i <= qi->qf_lists[qi->qf_curlist].qf_count; ++i)
+     {
++	/* Handle entries with a non-existing buffer number. */
++	bufnum = qfp->qf_fnum;
++	if (bufnum != 0 && (buflist_findnr(bufnum) == NULL))
++	    bufnum = 0;
++
+ 	if ((dict = dict_alloc()) == NULL)
+ 	    return FAIL;
+ 	if (list_append_dict(list, dict) == FAIL)
+@@ -3441,7 +3454,7 @@
+ 
+ 	buf[0] = qfp->qf_type;
+ 	buf[1] = NUL;
+-	if ( dict_add_nr_str(dict, "bufnr", (long)qfp->qf_fnum, NULL) == FAIL
++	if ( dict_add_nr_str(dict, "bufnr", (long)bufnum, NULL) == FAIL
+ 	  || dict_add_nr_str(dict, "lnum",  (long)qfp->qf_lnum, NULL) == FAIL
+ 	  || dict_add_nr_str(dict, "col",   (long)qfp->qf_col, NULL) == FAIL
+ 	  || dict_add_nr_str(dict, "vcol",  (long)qfp->qf_viscol, NULL) == FAIL
+@@ -3472,6 +3485,7 @@
+     listitem_T	*li;
+     dict_T	*d;
+     char_u	*filename, *pattern, *text, *type;
++    int		bufnum;
+     long	lnum;
+     int		col, nr;
+     int		vcol;
+@@ -3479,6 +3493,7 @@
+     int		valid, status;
+     int		retval = OK;
+     qf_info_T	*qi = &ql_info;
++    int		did_bufnr_emsg = FALSE;
+ 
+     if (wp != NULL)
+     {
+@@ -3508,6 +3523,7 @@
+ 	    continue;
+ 
+ 	filename = get_dict_string(d, (char_u *)"filename", TRUE);
++	bufnum = get_dict_number(d, (char_u *)"bufnr");
+ 	lnum = get_dict_number(d, (char_u *)"lnum");
+ 	col = get_dict_number(d, (char_u *)"col");
+ 	vcol = get_dict_number(d, (char_u *)"vcol");
+@@ -3519,12 +3535,26 @@
+ 	    text = vim_strsave((char_u *)"");
+ 
+ 	valid = TRUE;
+-	if (filename == NULL || (lnum == 0 && pattern == NULL))
++	if ((filename == NULL && bufnum == 0) || (lnum == 0 && pattern == NULL))
+ 	    valid = FALSE;
+ 
++	/* Mark entries with non-existing buffer number as not valid. Give the
++	 * error message only once. */
++	if (bufnum != 0 && (buflist_findnr(bufnum) == NULL))
++	{
++	    if (!did_bufnr_emsg)
++	    {
++		did_bufnr_emsg = TRUE;
++		EMSGN(_("E92: Buffer %ld not found"), bufnum);
++	    }
++	    valid = FALSE;
++	    bufnum = 0;
++	}
++
+ 	status =  qf_add_entry(qi, &prevp,
+ 			       NULL,	    /* dir */
+ 			       filename,
++			       bufnum,
+ 			       text,
+ 			       lnum,
+ 			       col,
+@@ -3757,6 +3787,7 @@
+ 				if (qf_add_entry(qi, &prevp,
+ 					    NULL,	/* dir */
+ 					    fnames[fi],
++					    0,
+ 					    IObuff,
+ 					    lnum,
+ 					    (int)(regmatch.startp[0] - IObuff)
+--- src/version.c.191	2007-02-06 06:18:06.000000000 -0500
++++ src/version.c	2007-02-06 06:18:06.000000000 -0500
+@@ -667,6 +667,8 @@
+ static int included_patches[] =
+ {   /* Add new patch number below this line */
+ /**/
++    191,
++/**/
+     190,
+ /**/
+     189,

README.patches

@@ -218,3 +218,6 @@ Individual patches for Vim 7.0:
   1731  7.0.186  ml_get error when doing "/\_s*/e" with utf-8 'encoding'
   7601  7.0.187  can't properly source a remote script
   1602  7.0.188  (after 7.0.186) warning for wrong pointer type
+  2290  7.0.189  translated message about finding matches is truncated
+  1778  7.0.190  "syntax spell default" results in an error message
+ 10918  7.0.191  the items used by getqflist() and setqflist() don't match

vim.spec

@@ -8,21 +8,20 @@
 
 %define withnetbeans 0
 
-%define withcvim 0
-
 %define withvimspell 0
 
 %define baseversion 7.0
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 188
+%define patchlevel 191
 
-Summary: The VIM editor.
+Summary: The VIM editor
+URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 3
+Release: 1%{?dist}
-License: freeware
+License: GPL
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
 Source1: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}%{?beta}-lang%{?CVSDATE}.tar.gz
@@ -37,8 +36,6 @@ Source9: gvim48.png
 Source10: gvim64.png
 Source11: Changelog.rpm
 #Source12: vi-help.txt
-# Source at http://www.vim.org/scripts/script.php?script_id=213 :
-#Source12: cvim.zip
 Source13: runtime-update-20060911.tar.bz2
 %if %{withvimspell}
 Source14: vim-spell-files.tar.bz2
@@ -52,23 +49,23 @@ Patch2010: xxd-locale.patch
 # If you're as lazy as me, generate the list using
 # for i in `seq 1 14`; do printf "Patch%03d: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.%03d\n" $i $i; done
 Patch001: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.001
-Patch002: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.002
+#Patch002: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.002
 Patch003: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.003
 Patch004: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.004
-Patch005: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.005
+#Patch005: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.005
-Patch006: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.006
+#Patch006: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.006
 Patch007: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.007
 Patch008: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.008
 Patch009: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.009
-Patch010: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.010
+#Patch010: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.010
 Patch011: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.011
-Patch012: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.012
+#Patch012: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.012
 Patch013: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.013
 Patch014: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.014
 Patch015: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.015
 Patch016: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.016
 Patch017: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.017
-Patch018: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.018
+#Patch018: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.018
 Patch019: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.019
 Patch020: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.020
 Patch021: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.021
@@ -77,13 +74,13 @@ Patch023: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.023
 Patch024: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.024
 Patch025: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.025
 Patch026: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.026
-Patch027: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.027
+#Patch027: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.027
-Patch028: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.028
+#Patch028: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.028
 Patch029: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.029
 Patch030: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.030
 Patch031: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.031
-Patch032: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.032
+#Patch032: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.032
-Patch033: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.033
+#Patch033: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.033
 Patch034: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.034
 Patch035: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.035
 Patch036: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.036
@@ -95,11 +92,11 @@ Patch041: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.041
 Patch042: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.042
 Patch043: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.043
 Patch044: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.044
-Patch045: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.045
+#Patch045: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.045
-Patch046: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.046
+#Patch046: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.046
 Patch047: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.047
-Patch048: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.048
+#Patch048: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.048
-Patch049: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.049
+#Patch049: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.049
 Patch050: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.050
 Patch051: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.051
 Patch052: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.052
@@ -107,7 +104,7 @@ Patch053: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.053
 Patch054: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.054
 Patch055: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.055
 Patch056: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.056
-Patch057: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.057
+#Patch057: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.057
 Patch058: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.058
 Patch059: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.059
 Patch060: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.060
@@ -115,7 +112,7 @@ Patch061: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.061
 Patch062: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.062
 Patch063: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.063
 Patch064: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.064
-Patch065: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.065
+#Patch065: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.065
 Patch066: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.066
 Patch067: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.067
 Patch068: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.068
@@ -124,9 +121,9 @@ Patch070: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.070
 Patch071: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.071
 Patch072: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.072
 Patch073: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.073
-Patch074: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.074
+#Patch074: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.074
 Patch075: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.075
-Patch076: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.076
+#Patch076: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.076
 Patch077: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.077
 Patch078: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.078
 Patch079: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.079_patched
@@ -143,7 +140,7 @@ Patch089: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.089
 Patch090: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.090
 Patch091: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.091
 Patch092: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.092
-Patch093: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.093
+#Patch093: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.093
 Patch094: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.094
 Patch095: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.095_patched
 Patch096: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.096
@@ -158,7 +155,7 @@ Patch104: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.104
 Patch105: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.105
 Patch106: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.106_patched
 Patch107: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.107
-Patch108: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.108
+#Patch108: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.108
 Patch109: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.109
 Patch110: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.110
 Patch111: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.111
@@ -180,15 +177,15 @@ Patch126: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.126
 Patch127: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.127
 Patch128: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.128
 Patch129: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.129
-Patch130: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.130
+#Patch130: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.130
 Patch131: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.131
-Patch132: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.132
+#Patch132: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.132
 Patch133: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.133
 Patch134: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.134
 Patch135: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.135
 Patch136: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.136
 Patch137: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.137
-Patch138: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.138
+#Patch138: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.138
 Patch139: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.139
 Patch140: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.140
 Patch141: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.141
@@ -206,12 +203,12 @@ Patch152: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.152
 Patch153: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.153
 Patch154: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.154
 Patch155: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.155
-Patch156: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.156
+#Patch156: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.156
 Patch157: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.157
 Patch158: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.158
 Patch159: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.159
 Patch160: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.160
-Patch161: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.161
+#Patch161: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.161
 Patch162: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.162
 Patch163: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.163
 Patch164: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.164
@@ -220,8 +217,8 @@ Patch166: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.166
 Patch167: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.167
 Patch168: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.168
 Patch169: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.169
-Patch170: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.170
+#Patch170: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.170
-Patch171: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.171
+#Patch171: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.171
 Patch172: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.172
 Patch173: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.173
 Patch174: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.174
@@ -230,7 +227,7 @@ Patch176: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.176
 Patch177: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.177
 Patch178: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.178
 Patch179: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.179
-Patch180: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.180
+#Patch180: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.180
 Patch181: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.181
 Patch182: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.182
 Patch183: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.183
@@ -239,13 +236,15 @@ Patch185: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.185
 Patch186: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.186
 Patch187: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.187
 Patch188: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.188
+Patch189: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.189
+Patch190: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.190
+Patch191: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.191
 
 Patch3000: vim-7.0-syntax.patch
 #Patch3001: vim-6.2-rh1.patch
 Patch3002: vim-6.1-rh2.patch
 Patch3003: vim-6.1-rh3.patch
 Patch3004: vim-7.0-rclocation.patch
-Patch3005: vim-6.4-cvim.patch
 Patch3006: vim-6.4-checkhl.patch
 Patch3007: vim-7.0-fstabsyntax.patch
 Patch3008: vim-6.4-lib64.patch
@@ -257,7 +256,7 @@ Patch3012: vim-7.0-specedit.patch
 Patch3100: vim-selinux.patch
 Patch3101: vim-selinux2.patch
 
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires: python-devel perl ncurses-devel gettext
 Buildrequires: libacl-devel gpm-devel autoconf
 %if %{WITH_SELINUX}
@@ -265,7 +264,7 @@ Buildrequires: libselinux-devel
 %endif
 %if %{desktop_file}
 Requires: /usr/bin/desktop-file-install
-BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
+BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 %endif
 Epoch: 2
 
@@ -278,7 +277,6 @@ multiple windows, multi-level undo, block highlighting and more.
 %package common
 Summary: The common files needed by any version of the VIM editor.
 Group: Applications/Editors
-Obsoletes: vim7-common
 Conflicts: man-pages-fr < 0.9.7-14
 Conflicts: man-pages-it < 0.3.0-17
 Conflicts: man-pages-pl < 0.24-2
@@ -306,8 +304,7 @@ many different languages.
 %package minimal
 Summary: A minimal version of the VIM editor.
 Group: Applications/Editors
-Obsoletes: vim7-minimal
+Provides: vi = %{version}-%{release}
-Provides: vi
 
 %description minimal
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -323,9 +320,7 @@ package is installed.
 Summary: A version of the VIM editor which includes recent enhancements.
 Group: Applications/Editors
 Requires: vim-common = %{epoch}:%{version}-%{release}
-Provides: vim
+Provides: vim = %{version}-%{release}
-Obsoletes: vim-color
-Obsoletes: vim7-enhanced
 
 %description enhanced
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -343,10 +338,8 @@ 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 = %{epoch}:%{version}-%{release} libattr
+Requires: vim-common = %{epoch}:%{version}-%{release} libattr gtk2 >= 2.6
 BuildRequires: gtk2-devel libSM-devel libXt-devel libXpm-devel
-Prereq: gtk2 >= 2.6
-Obsoletes: vim7-X11
 
 %description X11
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -594,6 +587,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch186 -p0
 %patch187 -p0
 %patch188 -p0
+%patch189 -p0
+%patch190 -p0
+%patch191 -p0 -b .191
 
 # install spell files
 %if %{withvimspell}
@@ -619,12 +615,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3101 -p1
 %endif
 
-%if "%{withcvim}" == "1"
-mkdir cvim
-( cd cvim; unzip %{SOURCE12}; )
-patch -p1 < %{PATCH3005}
-%endif
-
 
 %build
 cd src
@@ -646,7 +636,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_
   --disable-netbeans \
 %endif
 
-make
+make %{?_smp_mflags}
 cp vim gvim
 make clean
 
@@ -662,7 +652,7 @@ make clean
   --disable-netbeans \
 %endif
 
-make
+make %{?_smp_mflags}
 cp vim enhanced-vim
 make clean
 
@@ -676,36 +666,18 @@ perl -pi -e "s/\/etc\/vimrc/\/etc\/virc/"  os_unix.h
   --with-compiledby="<bugzilla@redhat.com>" \
   --with-modified-by="<bugzilla@redhat.com>"
 
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/bin
 mkdir -p $RPM_BUILD_ROOT/usr/bin
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/after
-#cp -f %{SOURCE5} .
+cp -f %{SOURCE11} .
 
-%if "%{withcvim}" == "1"
-# cvim plugin stuff:
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/vim/%{vimdir}/codesnippets-c
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/vim/%{vimdir}/plugin/templates
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/vim/%{vimdir}/wordlists
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/vim/%{vimdir}/rc
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/vim/%{vimdir}/ftplugin
-   install -m644 cvim/codesnippets-c/*  $RPM_BUILD_ROOT%{_datadir}/vim/%{vimdir}/codesnippets-c/
-   install -m644 cvim/plugin/templates/*  $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/plugin/templates/
-   install -m644 cvim/plugin/wrapper.sh  $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/plugin/
-   install -m644 cvim/plugin/c.vim  $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/plugin/
-   install -m644 cvim/plugin/templates/*  $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/plugin/templates/
-   install -m644 cvim/rc/*  $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/rc/
-   install -m644 cvim/wordlists/*  $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/wordlists/
-   install -m644 cvim/ftplugin/*  $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/ftplugin/
-   cp cvim/doc/* runtime/doc
-   cp cvim/README.csupport .
-%endif
 
 cd src
-%makeinstall BINDIR=/bin DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin
 mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/usr/bin/xxd
 make installmacros DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
@@ -833,7 +805,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/vimrc
 %doc README*
 %doc runtime/docs
-%doc $RPM_SOURCE_DIR/Changelog.rpm
+%doc Changelog.rpm
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/%{vimdir}
 %dir %{_datadir}/%{name}/vimfiles
@@ -990,6 +962,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Feb 06 2007 Karsten Hopp <karsten@redhat.com> 7.0.191-1
+- patchlevel 191
+- clean up spec file for rpmlint
+- drop cvim stuff
+
 * Tue Jan 23 2007 Karsten Hopp <karsten@redhat.com> 7.0.188-3
 - patchlevel 188