diff --git a/.cvsignore b/.cvsignore
index 9937f5c..5a499ed 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
-vim-6.1-lang.tar.bz2
-vim-6.1.tar.bz2
+vim-6.2-extra.tar.gz
+vim-6.2-lang.tar.gz
+vim-6.2.tar.bz2
diff --git a/README.patches b/README.patches
index 73e3183..c50da54 100644
--- a/README.patches
+++ b/README.patches
@@ -20,11 +20,137 @@ an argument to make it patch the right file:
After applying a patch, you need to compile Vim. There are no
patches for binaries.
+Individual patches for Vim 6.2:
+ SIZE NAME FIXES
+ 2146 6.2.001 help tags for ":stopinsert" were missing
+ 1803 6.2.002 crash for UTF-8 char when compiled without +eval feature
+ 2363 6.2.003 GTK 2: wide characters between 128 and 256 not displayed right
+ 1890 6.2.004 put in Visual-line selection at end of file goes wrong
+ 1350 6.2.005 GTK: Find and Find-Replace dialogs don't work
+ 5612 6.2.006 the netbeans code had an obsolete function with "vim61"
+ 2922 6.2.007 listing Cscope tag matches does not always work
+ 1505 6.2.008 XIM with GTK 2: preedit chars wrong after using backspace
+ 4129 6.2.009 Win32: self-installing exe "Full" install doesn't work
+ 1584 6.2.010 cursor can't move with multi-byte char and 'virtualedit' set
+ 1617 6.2.011 compilation problem when stat() is a macro
+ 1959 6.2.012 may hang when polling for a character when XSMP is supported
+ 1657 6.2.013 (extra) Win32: GvimExt uninstall key used "Vim 6.1"
+ 1493 6.2.014 (after 6.2.012) XSMP doesn't work when using poll()
+ 2821 6.2.015 the +xsmp feature is never enabled
+ 5242 6.2.016 small problems with cscope, also on Win32
+ 2102 6.2.017 test 11 sometimes prompts the user for a changed file
+ 3108 6.2.018 Unix: may need to press a key when reading from stdin
+ 2635 6.2.019 (lang) Portugese menu contains a split line
+ 2537 6.2.020 the "Syntax/Set syntax only" menu item causes an error message
+ 4626 6.2.021 the user manual section on exceptions contains small mistakes
+ 1929 6.2.022 (extra) Win32: delete menu item remains in torn off menu
+ 1699 6.2.023 (extra) the clean rule of Make_ivc.mak didn't clean enough
+ 2058 6.2.024 (extra) Win32: compiler warnings for typecasts
+ 1553 6.2.025 Mac: missing prototype for sigaltstack()
+ 1439 6.2.026 may get a warning for utimes() argument
+ 1475 6.2.027 warning for uninitialized variable when not using multi-byte
+ 1709 6.2.028 cscope may kill wrong process
+ 1364 6.2.029 using remote server may cause memory to leak
+ 3355 6.2.030 Mac: warnings for not using precompiled header files
+ 3392 6.2.031 ":options" causes a couple of errors
+ 2356 6.2.032 the lpc filetype was never recognized
+ 3676 6.2.033 (extra) Mac: various compiler warnings
+ 1522 6.2.034 Mac: avoid redefining DEFAULT_TERM
+ 2547 6.2.035 Mac: avoid compiler warnings in Python interface
+ 2182 6.2.036 Mac: add slash to directory names like on Unix
+ 1698 6.2.037 Win32: could get arbitrary codepage from encoding name
+ 5094 6.2.038 (extra) Win32: warning messages when using the MingW compiler
+ 1947 6.2.039 (extra) fix a few more warning messages for MingW
+ 2241 6.2.040 crash while starting up when using +xsmp feature
+ 3110 6.2.041 (extra, after 6.2.033) Mac: fix various compiler warnings
+ 2157 6.2.042 (extra) Cygwin: avoid optimizer problem with GCC 3.2
+ 6364 6.2.043 compiling with both netbeans and workshop doesn't work
+ 4119 6.2.044 confusing error message for ":au" about wrong event name
+ 2065 6.2.045 obtaining the '( mark changes the '' mark
+ 1910 6.2.046 with error in function arguments the function is still called
+ 2266 6.2.047 (extra) Win32: more MingW compiler warning fixes
+ 2462 6.2.048 Win32: Python interface doesn't work with Python 2.3
+ 1579 6.2.049 ":command -range=" doesn't give an error message
+ 1557 6.2.050 test 32 doesn't work on MS-Windows
+ 2110 6.2.051 when using "\=submatch(0)" in ":s" line breaks become NUL
+ 2008 6.2.052 a couple of messages are not translated
+ 1645 6.2.053 prototype for bzero() differs from what most systems use
+ 2136 6.2.054 backslash in trail byte doesn't work inside strings
+ 1499 6.2.055 wrong result when using col('.') after CTRL-O in Insert mode
+ 1744 6.2.056 (extra) Win32: building with Sniff++ doesn't work
+ 3848 6.2.057 (extra) Mac: compiler warnings when using -DMACOS_X
+ 1752 6.2.058 crash when 'autochdir' is set and buffer has no name
+ 1858 6.2.059 part of window not updated after listing completions
+ 3760 6.2.060 (extra) Win32: lalloc(0) error for copy/paste when 'enc' set
+ 1446 6.2.061 GUI: shift-left-click scrolls text instead of doing "*"
+ 1579 6.2.062 syntax highlighting wrong when using "containedin"
+ 21709 6.2.063 when using custom completion end up with no matches
+ 21234 6.2.064 resolve() only does one symlink; add the simplify() function
+ 1769 6.2.065 ":windo 123" only updates other windows when entering them
+ 7705 6.2.066 (extra) the Ruby interface doesn't work with Ruby 1.8
+ 2028 6.2.067 redraw error when searched text starts with composing char
+ 2359 6.2.068 Netbeans: file name with special characters causes trouble
+ 2732 6.2.069 (after 6.2.064) warnings for unused variables
+ 1749 6.2.070 (after 6.2.069) still a warning for an unused variable
+ 2779 6.2.071 limit for nr of items in 'statusline' is too low
+ 2762 6.2.072 using foldlevel() in 'foldexpr' cannot get level of prev. line
+ 7937 6.2.073 adding filetype detection requires editing "filetype.vim"
+ 3295 6.2.074 warnings when compiling the Python interface
+ 1696 6.2.075 message for failed writing of viminfo file contains NULL
+ 8821 6.2.076 cscope tags can be listed in the wrong order
+ 1869 6.2.077 custom completion function gets zero instead of empty string
+ 1925 6.2.078 "make test" doesn't work if Vim was not compiled yet
+ 2238 6.2.079 ":w ++enc=utf-8 !cmd" doesn't work
+ 3320 6.2.080 when 't_ti' is not empty "ZZ" may not clear the command line
+ 1469 6.2.081 length of multibyte string in the statusline is computed wrong
+ 2298 6.2.082 can't compile with Perl 5.8.1
+ 4112 6.2.083 words marked with ^^^^ in quickfix window don't line up
+ 1813 6.2.084 in Visual mode "g_" always goes to past the end of the line
+ 3876 6.2.085 ":verb set ts" should refer to "-c" and "--cmd" argument
+ 2331 6.2.086 "{" and "}" don't work very well with closed folds
+ 3779 6.2.087 CTRL-^ and ":bnext" don't respect the 'confirm' option
+ 3125 6.2.088 when 'sidescrolloff' is set 'showmatch' may not work correctly
+ 1880 6.2.089 ":set isk+=" adds a comma
+ 3024 6.2.090 (extra) #pragma's cause trouble for MingW compiler
+ 2329 6.2.091 dropping a file on Vim may cause following messages to scroll
+ 3202 6.2.092 a few invalid tags appear in the help tags file
+ 1639 6.2.093 "nnoremenu" worked like ":noremenu"
+ 3083 6.2.094 GTK version can't be compiled with tiny features
+ 1796 6.2.095 the message "Cannot go to buffer x" is confusing for ":buf 6"
+ 2426 6.2.096 Win32: ":let @* = ''" put a newline on the clipboard
+ 2064 6.2.097 changing 'insertmode' doesn't always have immediate effect
+ 3231 6.2.098 (after 6.2.097) can't compile with tiny features
+ 1636 6.2.099 (extra) test 49 fails because of a wrong Polish translation
+ 2670 6.2.100 cannot generate prototypes when Perl interface is enabled
+ 3248 6.2.101 syntax highlighting can become very slow for big files
+ 33002 6.2.102 CR and equal() conflict with Mac header files, rename them
+ 2422 6.2.103 (extra) extra files for patch 6.2.102
+ 1999 6.2.104 unmatched curly braces in table with options
+ 2860 6.2.105 crash in rare situation when using cindent()
+ 2682 6.2.106 tag searching gets stuck on a very long line in tags file
+ 71562 6.2.107 (extra) Win32: add support for Netbeans interface
+ 2708 6.2.108 crash when giving German message for ignoring case in tag
+ 2199 6.2.109 compiler warning for Amiga compiler (and others)
+ 2186 6.2.110 a menu translation without encoding isn't always found
+ 1482 6.2.111 encoding "cp1251" is not recognized
+ 2995 6.2.112 "make clean" doesn't delete enough files in src/testdir
+ 1901 6.2.113 using ":startinsert" after "$" works like "a" instead of "i"
+ 2647 6.2.114 size of screen may be wrong when stdout is redirected
+ 8474 6.2.115 (extra) compiler warnings with various Amiga compilers
+ 1925 6.2.116 (extra) keypad problems on German keyboard with numlock set
+ 6688 6.2.117 breakpoints did not work in while loops
+ 50945 6.2.118 (extra) Mac: compile Carbon version with Unix Makefile
+ 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
+
+
Collection of patches for Vim 6.1:
SIZE NAME INCLUDES
85516 6.1.1-100.gz patches 6.1.001 to 6.1.100, gzip'ed
128949 6.1.101-200.gz patches 6.1.101 to 6.1.200, gzip'ed
99305 6.1.201-300.gz patches 6.1.201 to 6.1.300, gzip'ed
+199266 6.1.301-400.gz patches 6.1.301 to 6.1.400, gzip'ed
Individual patches for Vim 6.1:
SIZE NAME FIXES
@@ -348,6 +474,160 @@ Individual patches for Vim 6.1:
3169 6.1.318 quotes in compiler flags cause trouble in auto/pathdef.c
2012 6.1.319 :vim --remote +cmd file" did not execute "cmd"
4713 6.1.320 (depends on 6.1.313) '\' in ":drop file\ name" not removed
+ 2435 6.1.321 when 'mouse' is "n" the mouse may still start Visual mode
+ 1831 6.1.322 (extra, depends on 6.1.315) Win32: host name starts with "PC"
+ 5887 6.1.323 ":registers" doesn't stop for "q" at more prompt
+ 10357 6.1.324 drag vert. separator may crash Vim; keep focus when dragging
+ 1549 6.1.325 in an xterm shift-Tab is not recognized
+ 1737 6.1.326 searching may result in reading from uninitialzed data
+ 3319 6.1.327 UTF-8 characters in mbyte.txt help file are unreadable
+ 1923 6.1.328 missing prototype for enc_canon_search()
+ 2544 6.1.329 expanding ":Cmd %" does not work properly for file "a b c"
+ 4021 6.1.330 GUI: keypad keys produce same code as normal keys
+ 2645 6.1.331 in a translated help file "LOCAL ADDITIONS" cannot be found
+ 9886 6.1.332 (extra) Win32: Perl 5.8 cannot be used
+ 20579 6.1.333 (extra) Win32: Unicode on the clipboard is not supported
+ 2929 6.1.334 (extra, depends on 6.1.303) Hebrew characters drawn wrong
+ 1763 6.1.335 (extra) failure of obtaining position/size is ignored
+ 1552 6.1.336 (extra) Win32: warning for prototype of smsg()
+ 2001 6.1.337 "finish" in debug mode doesn't stop at end of each function
+ 1709 6.1.338 in Insert mode files changed outside of Vim are not detected
+ 1677 6.1.339 cmdline completion for ":let g:" doesn't work
+ 2352 6.1.340 (extra, depends on 6.1.332) can't build with Perl interface
+ 7066 6.1.341 problems with double-wide chars in Insert mode
+ 2285 6.1.342 (depends on 6.1.341) cursor wrong for "c" on double-wide char
+ 3860 6.1.343 (depends on 6.1.342) can't compile with(out) some features
+ 1514 6.1.344 ":silent filetype" writes to the message history
+ 3209 6.1.345 (extra) Win32: 'imdisable' doesn't work
+ 7584 6.1.346 make the scroll wheel scroll the window at the mouse pointer
+ 3554 6.1.347 tags listed for cscope are sometimes in the wrong order
+ 3797 6.1.348 ":set wildmode=list,full" sometimes returned wrong entry
+ 19583 6.1.349 "vim --serverlist" didn't work properly without Vim servers
+ 2401 6.1.350 ":bnext" may overrule cursor position from autocommand
+ 3044 6.1.351 crash on first startup in an X server
+ 2658 6.1.352 (extra, depends on 6.1.345) crash when setting 'imd' in vimrc
+ 2954 6.1.353 (extra, depends on 6.1.334) problem drawing multi-byte chars
+ 1842 6.1.354 (extra, depends on 6.1.333) notepad can't paste from clipboard
+ 20777 6.1.355 '\n' in a regexp will never match anything in a string
+ 5880 6.1.356 (extra, depends on various) fix compiler warnings
+ 1661 6.1.357 in Insert mode CR in quickfix window doesn't jump to error
+ 2609 6.1.358 tutor does not select another local version correctly
+ 3005 6.1.359 (extra) Mac: set focus; crash when using horizontal scrollbar
+ 8367 6.1.360 (depends on 6.1.341) ^R ESC in Insert mode garbles multi-byte
+ 4367 6.1.361 cannot jump to another file with ":'M"
+ 7017 6.1.362 error code from tgetent() and tgetflag() may be misinterpreted
+ 1791 6.1.363 byte2line() can return one more than the number of lines
+ 5443 6.1.364 the FileChangedShell event does not allow nesting
+ 1457 6.1.365 ":breakadd" doesn't work for a relative file name
+181487 6.1.366 add the Netbeans interface, 'autochdir', -bg and -fg for GTK
+ 2418 6.1.367 (depends on 6.1.365) can't set a breakpoint in a function
+ 4231 6.1.368 ":map" completion and ":mkexrc" misses <silent> and <script>
+ 20765 6.1.369 (extra) VMS: hang for read-only file; quickfix version problem
+ 17194 6.1.370 #ifdef nesting is unclear in os_unix.c
+ 2044 6.1.371 "%V" in 'statusline' doesn't show "0-1" in an empty line
+ 9996 6.1.372 warnings when using 16 bit ints in syntax.c
+ 7785 6.1.373 'printheader' and 'titleold' are not translated
+ 6269 6.1.374 (extra) support building GvimExt with MingW and Cygwin
+ 1771 6.1.375 ':!dir "%"' doesn't work if file name contains spaces
+ 2118 6.1.376 "vim --help" and "vim --version" have a non-zero exit code
+ 1714 6.1.377 can't add words to 'lispwords' option
+ 3592 6.1.378 two ambiguous buffer-local user commands obscure global one
+ 1882 6.1.379 Linux: busy hang if terminal exits and compiled with threading
+ 1476 6.1.380 quickfix window can be zero lines high
+ 1555 6.1.381 window closed even when a BufWriteCmd fails to write the file
+ 5252 6.1.382 (extra) Win32: cannot handle two monitors properly
+ 19578 6.1.383 multi-byte characters in 'statusline' cause filling to fail
+ 4562 6.1.384 cannot detect if a certain patch has been included
+ 1544 6.1.385 (depends on 6.1.383) compilation problem without +multi_byte
+ 5183 6.1.386 duplicate tags when using ":helptags"
+ 1629 6.1.387 (depends on 6.1.373) compiler warning
+ 1881 6.1.388 (depends on 6.1.388) compiler warning
+ 45272 6.1.389 (depends on 6.1.366) add +balloon_eval and sign icons for GTK
+ 16322 6.1.390 (depends on 6.1.389) extend Netbeans, support multi-byte signs
+ 1539 6.1.391 ml_get error when using 'virtualedit'
+ 2162 6.1.392 highlighting in 'statusline' positioned wrong when truncating
+ 5378 6.1.393 Linux + Python: Vim loops forever when the terminal is killed
+ 2039 6.1.394 can't define multi-byte text glyph through Netbeans interface
+ 4334 6.1.395 (extra, depends on 6.1.369) VMS: fix makefile and prototype
+ 2381 6.1.396 compiler warnings for using enum
+ 2344 6.1.397 (extra) default diff command doesn't work with space in path
+ 5642 6.1.398 add command to avoid saving typeahead in debug mode
+ 1521 6.1.399 compiler warning for unused variable two_or_more
+ 2077 6.1.400 a BufWriteCmd that wipes out a buffer causes trouble
+ 16078 6.1.401 (extra) make Win16 makefile work with Borland C 5.01
+ 4847 6.1.402 error in evaluationg curly braces is not handled consistently
+ 6152 6.1.403 (extra) compiler warnings for 16 bit MS-Windows
+ 54168 6.1.404 (extra) various small fixes, additions and corrections
+ 1482 6.1.405 a few files are missing from the toplevel Makefile
+ 1534 6.1.406 not fitting statusline item causes arbitrary text to appear
+ 1456 6.1.407 'scrollbind' can be set in help window
+ 3133 6.1.408 unprintable char 0x0c was displayed as >c0< if 'rightleft' set
+ 1729 6.1.409 generating help tags doesn't work in some locales
+ 1552 6.1.410 linking fails with +netbeans_intg but without sign icons
+ 1681 6.1.411 with 'virtualedit' set Visual block can be displayed wrong
+ 1722 6.1.412 shell prompt after hit-enter prompt when using ":gui"
+ 4842 6.1.413 "p" doesn't work in Visual mode if "unnamed" is in 'clipboard'
+ 3429 6.1.414 (extra, dep. 6.1.369) VMS: busy wait for input
+ 2286 6.1.415 wrong window layout when reducing height with quickfix window
+ 2313 6.1.416 (depends on 6.1.366) Netbeans: can't change a line with a sign
+ 6610 6.1.417 unprintable multi-byte characters are not handled correctly
+ 13963 6.1.418 (extra) strftime() can be used with wrong encoding
+ 3152 6.1.419 cannot compile on AIX 5.1
+ 7237 6.1.420 (extra) inconsistent use of convert_input(), string_convert()
+ 6305 6.1.421 (extra) MS-Windows 9x: clipboard encoding can be wrong
+ 1876 6.1.422 don't get hit-enter prompt for error message from .vimrc
+ 20254 6.1.423 add ":helpgrep" command to be able to search in help files
+ 2360 6.1.424 (extra) Vim compiled with VC 7.0 won't show menus on Win95
+ 3143 6.1.425 ":helptags $VIMRUNTIME/doc" doesn't add "help-tags" tag
+ 1631 6.1.426 "vim --remote-wait +cmd file" waited forever
+ 13458 6.1.427 many messages for using regexp patterns are not translated
+ 2127 6.1.428 FreeBSD: using system() in a startup script may cause a hang
+ 1636 6.1.429 when using a text sign and removing the text Vim may crash
+ 1555 6.1.430 Lisp: when matching parens skip over backslashed ()[]{}
+ 1938 6.1.431 debug commands end up in redirected text
+ 1819 6.1.432 (after 6.1.375) MS-Windows: ":!make %" doubles backslashes
+ 10377 6.1.433 make ":popup" work for GTK
+ 11383 6.1.434 (extra) click on scrollbar arrow didn't always scroll one line
+ 2205 6.1.435 ":winsize" and ":winpos" don't check for wrong arguments
+ 2755 6.1.436 add line number to warning for illegal byte when reading file
+ 3026 6.1.437 (extra, after 6.1.421) Win32: can't compile without multi-byte
+ 3830 6.1.438 add configure check to disable Perl when it has thread support
+ 8740 6.1.439 Netbeans: implement the missing "create" function
+ 4677 6.1.440 ":@*" didn't obtain the actual contents of the clipboard
+ 2431 6.1.441 "zj" and "zk" cannot be used after an operator
+ 11727 6.1.442 update multi-byte tables for Unicode 3.2
+ 2234 6.1.443 (extra) Win32 Borland: the gvimext.dll requires another DLL
+ 4114 6.1.444 (extra) Win32: enable gettext support differs for bc5 and mvc
+ 1413 6.1.445 (extra) DJGPP: get warning for argument of putenv()
+ 18999 6.1.446 (extra) use yes/no for MingW make arguments, more IME support
+ 1912 6.1.447 don't use "make" directly, use $(MAKE)
+ 1531 6.1.448 max field width default in 'titlestring' was an arbitrary 50
+ 2424 6.1.449 with "1a" in 'fo' appending moves every word to the next line
+ 3350 6.1.450 back-tab termcap/terminfo code is not used
+ 2041 6.1.451 get backslash before '/' and '?' in GUI find dialog text
+ 1622 6.1.452 (extra, after 6.1.446) IME doesn't work with MSVC
+ 1611 6.1.453 (after 6.1.429) crash adding sign without sign icons support
+ 37558 6.1.454 (extra) Win32: encoding conversion from/to clipboard wrong
+ 11743 6.1.455 add 'ambiwidth' option to chose cell width of Unicode chars
+ 2718 6.1.456 (extra, after 6.1.454) Win32: IME doesn't work
+ 1940 6.1.457 empty register in viminfo causes conversion failure
+ 1619 6.1.458 compiler warning for pointer
+ 3565 6.1.459 (extra) Win32: better check for libcall() returned pointer
+ 3764 6.1.460 scrolling one line with scrollbar doesn't always work
+ 2243 6.1.461 first character typed in Select mode isn't keymapped
+ 10270 6.1.462 wiping out a buffer in autocommands may cause a crash
+ 3002 6.1.463 the gzip plugin uses a weird name for writing compressed file
+ 3951 6.1.464 crash when using complicated syntax highlighting
+ 2429 6.1.465 (after 6.1.454) compilation problems with Cygwin
+ 5348 6.1.466 add --nofork argument as an alternative to -f
+ 3775 6.1.467 setting window title to Chinese doesn't work properly
+ 1771 6.1.468 ":mksession" stores folds for unrestorable buffers
+ 11961 6.1.469 'fillchars' cannot contain utf-8 characters
+ 8304 6.1.470 (lang) wrong Polish msgs on MS-Windows; English translations
+ 2146 6.1.471 ":jumps" output doesn't stop after pressing "q" at more-prompt
+ 6433 6.1.472 an X11 IO error may cause Vim to exit unexpectedly
+ 2035 6.1.473 Perl interface doesn't work with Perl 5.6
+ 2331 6.1.474 get stuck when opening the commandline window in Ex mode
Collection of patches for Vim 6.0:
diff --git a/sources b/sources
index 3d5edba..53f0128 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-bee37483e2e883ef421df6830f7b89b4 vim-6.1-lang.tar.bz2
-7fd0f915adc7c0dab89772884268b030 vim-6.1.tar.bz2
+db0db37baea01874867d8d2414db104c vim-6.2-extra.tar.gz
+aa0079938f636d08be71078933477d8b vim-6.2-lang.tar.gz
+c49d360bbd069d00e2a57804f2a123d9 vim-6.2.tar.bz2
diff --git a/vim-6.2-rh4.patch b/vim-6.2-rh4.patch
new file mode 100644
index 0000000..cb774bb
--- /dev/null
+++ b/vim-6.2-rh4.patch
@@ -0,0 +1,13 @@
+--- vim62/src/osdef2.h.in.rh4 Tue Sep 16 09:05:14 2003
++++ vim62/src/osdef2.h.in Tue Sep 16 09:04:49 2003
+@@ -48,8 +48,8 @@
+ extern int tgetent __ARGS((char *, char *));
+ extern int tgetnum __ARGS((char *));
+ extern int tgetflag __ARGS((char *));
+-extern char *tgoto __ARGS((char *, int, int));
+-extern int tputs __ARGS((char *, int, int (*)(int)));
++extern char *tgoto __ARGS((const char *, int, int));
++extern void tputs __ARGS((const char *, int, int (*)(int)));
+
+ #ifdef HAVE_TERMIOS_H
+ struct termios; /* for tcgetattr __ARGS */
diff --git a/vim-6.2-specsyntax.patch b/vim-6.2-specsyntax.patch
new file mode 100644
index 0000000..334d8a1
--- /dev/null
+++ b/vim-6.2-specsyntax.patch
@@ -0,0 +1,32 @@
+--- vim62d/runtime/syntax/spec.vim.highlite 2003-05-13 14:48:55.000000000 +0200
++++ vim62d/runtime/syntax/spec.vim 2003-05-13 14:52:51.000000000 +0200
+@@ -38,7 +38,7 @@
+ syn match specManpageFile '[a-zA-Z]\.1'
+
+ "Day, Month and most used license acronyms
+-syn keyword specLicense contained GPL LGPL BSD MIT GNU
++syn keyword specLicense contained GPL LGPL BSD MIT GNU distributable
+ syn keyword specWeekday contained Mon Tue Wed Thu Fri Sat Sun
+ syn keyword specMonth contained Jan Feb Mar Apr Jun Jul Aug Sep Oct Nov Dec
+ syn keyword specMonth contained January February March April May June July August September October November December
+@@ -61,9 +61,9 @@
+
+ "specComands
+ syn match specConfigure contained '\./configure'
+-syn match specTarCommand contained '\<tar\s\+[cxvpzIf]\{,5}\s*'
++syn match specTarCommand contained '\<tar\s\+[cxvpzIjf]\{,5}\s*'
+ syn keyword specCommandSpecial contained root
+-syn keyword specCommand contained make xmkmf mkdir chmod ln find sed rm strip moc echo grep ls rm mv mkdir install cp pwd cat tail then else elif cd gzip rmdir ln eval export touch
++syn keyword specCommand contained make xmkmf mkdir chmod ln find sed rm strip moc echo grep ls rm mv mkdir install cp pwd cat tail then else elif cd gzip rmdir ln eval export touch bzip2 bunzip2 gunzip
+ syn cluster specCommands contains=specCommand,specTarCommand,specConfigure,specCommandSpecial
+
+ "frequently used rpm env vars
+@@ -105,7 +105,7 @@
+ "%% PreAmble Section %%
+ "Copyright and Serial were deprecated by License and Epoch
+ syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+-syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
++syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|ExcludeOS\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+
+ "%% Description Section %%
+ syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
diff --git a/vim.spec b/vim.spec
index 7ac5647..288b34b 100644
--- a/vim.spec
+++ b/vim.spec
@@ -2,370 +2,190 @@
%if %{desktop_file}
%define desktop_file_utils_version 0.2.93
%endif
-# Set this to 0 if you don't want to build gvim:
+
+# Set this to 1 if you're building the enterprise version
+%define enterprise 0
+
+%if %{enterprise}
+# don't build gvim
+%define withgui 0
+# don't build the gtk2 gui
+%define withgtk2 0
+# don't include ruby interpreter
+%define withruby 0
+%else
%define withgui 1
+%define withgtk2 1
+%define withruby 0
+%endif
+
+
+%define baseversion 6.2
+%define vimdir vim62
+%define patchlevel 121
Summary: The VIM editor.
Name: vim
-Version: 6.1
-%define vimversion vim61
-Release: 29
+Version: %{baseversion}.%{patchlevel}
+Release: 1
License: freeware
Group: Applications/Editors
-Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{version}.tar.bz2
-Source1: ftp://ftp.vim.org/pub/vim/unreleased/extra/vim-%{version}-lang.tar.bz2
-Source2: gvim.desktop
-Source3: vimrc
-Source4: ftp://ftp.vim.org/pub/vim/patches/README.patches
-Patch0: vim-4.2-speed_t.patch
-Patch1: vim-5.1-vimnotvi.patch
-Patch2: vim-5.6a-paths.patch
-Patch3: vim-6.0-fixkeys.patch
-Patch4: vim-6.0-specsyntax.patch
-Patch5: vim-6.0r-crv.patch
-Patch10: xxd-locale.patch
-Patch11: vim-6.0-gcc31.patch
-# Patches 1000 and up are patches from the base maintainer.
+Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
+Source1: ftp://ftp.vim.org/pub/vim/extra/vim-%{baseversion}-lang.tar.gz
+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
+Patch2000: vim-4.2-speed_t.patch
+Patch2001: vim-5.1-vimnotvi.patch
+Patch2002: vim-5.6a-paths.patch
+Patch2003: vim-6.0-fixkeys.patch
+Patch2004: vim-6.2-specsyntax.patch
+Patch2005: vim-6.0r-crv.patch
+Patch2010: xxd-locale.patch
+# Patches 001 < 999 are patches from the base maintainer.
# If you're as lazy as me, generate the list using
-# (for i in `seq 1 57`; do echo "Patch`expr 1000 + $i`: ftp://ftp.vim.org/pub/vim/patches/6.1.`expr 1000 + $i | sed -e 's,^.,,'`"; done) >vimpatches
-Patch1001: ftp://ftp.vim.org/pub/vim/patches/6.1.001
-# Patch 2 is Windows only
-Patch1003: ftp://ftp.vim.org/pub/vim/patches/6.1.003
-Patch1004: ftp://ftp.vim.org/pub/vim/patches/6.1.004
-Patch1005: ftp://ftp.vim.org/pub/vim/patches/6.1.005
-Patch1006: ftp://ftp.vim.org/pub/vim/patches/6.1.006
-Patch1007: ftp://ftp.vim.org/pub/vim/patches/6.1.007
-Patch1008: ftp://ftp.vim.org/pub/vim/patches/6.1.008
-Patch1009: ftp://ftp.vim.org/pub/vim/patches/6.1.009
-Patch1010: ftp://ftp.vim.org/pub/vim/patches/6.1.010
-Patch1011: ftp://ftp.vim.org/pub/vim/patches/6.1.011
-Patch1012: ftp://ftp.vim.org/pub/vim/patches/6.1.012
-Patch1013: ftp://ftp.vim.org/pub/vim/patches/6.1.013
-Patch1014: ftp://ftp.vim.org/pub/vim/patches/6.1.014
-Patch1015: ftp://ftp.vim.org/pub/vim/patches/6.1.015
-# Patch 16 is Windows only
-Patch1017: ftp://ftp.vim.org/pub/vim/patches/6.1.017
-Patch1018: ftp://ftp.vim.org/pub/vim/patches/6.1.018
-# Patch 19 is Windows only
-Patch1020: ftp://ftp.vim.org/pub/vim/patches/6.1.020
-Patch1021: ftp://ftp.vim.org/pub/vim/patches/6.1.021
-Patch1022: ftp://ftp.vim.org/pub/vim/patches/6.1.022
-# Patch 23 is VMS only
-Patch1024: ftp://ftp.vim.org/pub/vim/patches/6.1.024
-Patch1025: ftp://ftp.vim.org/pub/vim/patches/6.1.025
-Patch1026: ftp://ftp.vim.org/pub/vim/patches/6.1.026
-Patch1027: ftp://ftp.vim.org/pub/vim/patches/6.1.027
-Patch1028: ftp://ftp.vim.org/pub/vim/patches/6.1.028
-Patch1029: ftp://ftp.vim.org/pub/vim/patches/6.1.029
-Patch1030: ftp://ftp.vim.org/pub/vim/patches/6.1.030
-Patch1031: ftp://ftp.vim.org/pub/vim/patches/6.1.031
-Patch1032: ftp://ftp.vim.org/pub/vim/patches/6.1.032
-Patch1033: ftp://ftp.vim.org/pub/vim/patches/6.1.033
-Patch1034: ftp://ftp.vim.org/pub/vim/patches/6.1.034
-# Patch 35 is Windows only
-Patch1036: ftp://ftp.vim.org/pub/vim/patches/6.1.036
-Patch1037: ftp://ftp.vim.org/pub/vim/patches/6.1.037
-Patch1038: ftp://ftp.vim.org/pub/vim/patches/6.1.038
-Patch1039: ftp://ftp.vim.org/pub/vim/patches/6.1.039
-Patch1040: ftp://ftp.vim.org/pub/vim/patches/6.1.040
-Patch1041: ftp://ftp.vim.org/pub/vim/patches/6.1.041
-Patch1042: ftp://ftp.vim.org/pub/vim/patches/6.1.042
-Patch1043: ftp://ftp.vim.org/pub/vim/patches/6.1.043
-# Patch 44 is Windows only
-Patch1045: ftp://ftp.vim.org/pub/vim/patches/6.1.045
-Patch1046: ftp://ftp.vim.org/pub/vim/patches/6.1.046
-Patch1047: ftp://ftp.vim.org/pub/vim/patches/6.1.047
-Patch1048: ftp://ftp.vim.org/pub/vim/patches/6.1.048
-Patch1049: ftp://ftp.vim.org/pub/vim/patches/6.1.049
-# Patch 50 is just a fix for 49
-Patch1051: ftp://ftp.vim.org/pub/vim/patches/6.1.051
-Patch1052: ftp://ftp.vim.org/pub/vim/patches/6.1.052
-Patch1053: ftp://ftp.vim.org/pub/vim/patches/6.1.053
-Patch1054: ftp://ftp.vim.org/pub/vim/patches/6.1.054
-Patch1055: ftp://ftp.vim.org/pub/vim/patches/6.1.055
-Patch1056: ftp://ftp.vim.org/pub/vim/patches/6.1.056
-Patch1057: ftp://ftp.vim.org/pub/vim/patches/6.1.057
-Patch1058: ftp://ftp.vim.org/pub/vim/patches/6.1.058
-Patch1059: ftp://ftp.vim.org/pub/vim/patches/6.1.059
-Patch1060: ftp://ftp.vim.org/pub/vim/patches/6.1.060
-Patch1061: ftp://ftp.vim.org/pub/vim/patches/6.1.061
-Patch1062: ftp://ftp.vim.org/pub/vim/patches/6.1.062
-Patch1063: ftp://ftp.vim.org/pub/vim/patches/6.1.063
-Patch1064: ftp://ftp.vim.org/pub/vim/patches/6.1.064
-Patch1065: ftp://ftp.vim.org/pub/vim/patches/6.1.065
-Patch1066: ftp://ftp.vim.org/pub/vim/patches/6.1.066
-Patch1067: ftp://ftp.vim.org/pub/vim/patches/6.1.067
-Patch1068: ftp://ftp.vim.org/pub/vim/patches/6.1.068
-Patch1069: ftp://ftp.vim.org/pub/vim/patches/6.1.069
-Patch1070: ftp://ftp.vim.org/pub/vim/patches/6.1.070
-Patch1071: ftp://ftp.vim.org/pub/vim/patches/6.1.071
-Patch1072: ftp://ftp.vim.org/pub/vim/patches/6.1.072
-# Patch 73 is just for PC5
-Patch1074: ftp://ftp.vim.org/pub/vim/patches/6.1.074
-Patch1075: ftp://ftp.vim.org/pub/vim/patches/6.1.075
-# Patch 76 is just for Mac
-Patch1077: ftp://ftp.vim.org/pub/vim/patches/6.1.077
-Patch1078: ftp://ftp.vim.org/pub/vim/patches/6.1.078
-Patch1079: ftp://ftp.vim.org/pub/vim/patches/6.1.079
-Patch1080: ftp://ftp.vim.org/pub/vim/patches/6.1.080
-Patch1081: ftp://ftp.vim.org/pub/vim/patches/6.1.081
-Patch1082: ftp://ftp.vim.org/pub/vim/patches/6.1.082
-Patch1083: ftp://ftp.vim.org/pub/vim/patches/6.1.083
-# Patch 84 needs to be redone someday
-Patch1084: ftp://ftp.vim.org/pub/vim/patches/6.1.084
-Patch1085: ftp://ftp.vim.org/pub/vim/patches/6.1.085
-Patch1086: ftp://ftp.vim.org/pub/vim/patches/6.1.086
-Patch1087: ftp://ftp.vim.org/pub/vim/patches/6.1.087
-# Patch 88 is Windows only
-Patch1089: ftp://ftp.vim.org/pub/vim/patches/6.1.089
-Patch1090: ftp://ftp.vim.org/pub/vim/patches/6.1.090
-Patch1091: ftp://ftp.vim.org/pub/vim/patches/6.1.091
-Patch1092: ftp://ftp.vim.org/pub/vim/patches/6.1.092
-# Patch 93 is Windows and Mac only
-Patch1094: ftp://ftp.vim.org/pub/vim/patches/6.1.094
-Patch1095: ftp://ftp.vim.org/pub/vim/patches/6.1.095
-Patch1096: ftp://ftp.vim.org/pub/vim/patches/6.1.096
-Patch1097: ftp://ftp.vim.org/pub/vim/patches/6.1.097
-Patch1098: ftp://ftp.vim.org/pub/vim/patches/6.1.098
-Patch1099: ftp://ftp.vim.org/pub/vim/patches/6.1.099
-# Patch 100 is Windows only
-Patch1101: ftp://ftp.vim.org/pub/vim/patches/6.1.101
-Patch1102: ftp://ftp.vim.org/pub/vim/patches/6.1.102
-Patch1103: ftp://ftp.vim.org/pub/vim/patches/6.1.103
-Patch1104: ftp://ftp.vim.org/pub/vim/patches/6.1.104
-Patch1105: ftp://ftp.vim.org/pub/vim/patches/6.1.105
-Patch1106: ftp://ftp.vim.org/pub/vim/patches/6.1.106
-Patch1107: ftp://ftp.vim.org/pub/vim/patches/6.1.107
-Patch1108: ftp://ftp.vim.org/pub/vim/patches/6.1.108
-Patch1109: ftp://ftp.vim.org/pub/vim/patches/6.1.109
-Patch1110: ftp://ftp.vim.org/pub/vim/patches/6.1.110
-Patch1111: ftp://ftp.vim.org/pub/vim/patches/6.1.111
-Patch1112: ftp://ftp.vim.org/pub/vim/patches/6.1.112
-Patch1113: ftp://ftp.vim.org/pub/vim/patches/6.1.113
-Patch1114: ftp://ftp.vim.org/pub/vim/patches/6.1.114
-Patch1115: ftp://ftp.vim.org/pub/vim/patches/6.1.115
-Patch1116: ftp://ftp.vim.org/pub/vim/patches/6.1.116
-Patch1117: ftp://ftp.vim.org/pub/vim/patches/6.1.117
-Patch1118: ftp://ftp.vim.org/pub/vim/patches/6.1.118
-Patch1119: ftp://ftp.vim.org/pub/vim/patches/6.1.119
-Patch1120: ftp://ftp.vim.org/pub/vim/patches/6.1.120
-Patch1121: ftp://ftp.vim.org/pub/vim/patches/6.1.121
-Patch1122: ftp://ftp.vim.org/pub/vim/patches/6.1.122
-Patch1123: ftp://ftp.vim.org/pub/vim/patches/6.1.123
-Patch1124: ftp://ftp.vim.org/pub/vim/patches/6.1.124
-Patch1125: ftp://ftp.vim.org/pub/vim/patches/6.1.125
-Patch1126: ftp://ftp.vim.org/pub/vim/patches/6.1.126
-Patch1127: ftp://ftp.vim.org/pub/vim/patches/6.1.127
-Patch1128: ftp://ftp.vim.org/pub/vim/patches/6.1.128
-Patch1129: ftp://ftp.vim.org/pub/vim/patches/6.1.129
-Patch1130: ftp://ftp.vim.org/pub/vim/patches/6.1.130
-Patch1131: ftp://ftp.vim.org/pub/vim/patches/6.1.131
-Patch1132: ftp://ftp.vim.org/pub/vim/patches/6.1.132
-Patch1133: ftp://ftp.vim.org/pub/vim/patches/6.1.133
-Patch1134: ftp://ftp.vim.org/pub/vim/patches/6.1.134
-Patch1135: ftp://ftp.vim.org/pub/vim/patches/6.1.135
-Patch1136: ftp://ftp.vim.org/pub/vim/patches/6.1.136
-Patch1137: ftp://ftp.vim.org/pub/vim/patches/6.1.137
-Patch1138: ftp://ftp.vim.org/pub/vim/patches/6.1.138
-Patch1139: ftp://ftp.vim.org/pub/vim/patches/6.1.139
-Patch1140: ftp://ftp.vim.org/pub/vim/patches/6.1.140
-Patch1141: ftp://ftp.vim.org/pub/vim/patches/6.1.141
-Patch1142: ftp://ftp.vim.org/pub/vim/patches/6.1.142
-Patch1143: ftp://ftp.vim.org/pub/vim/patches/6.1.143
-Patch1144: ftp://ftp.vim.org/pub/vim/patches/6.1.144
-Patch1145: ftp://ftp.vim.org/pub/vim/patches/6.1.145
-Patch1146: ftp://ftp.vim.org/pub/vim/patches/6.1.146
-# 147-149 are windows only
-Patch1150: ftp://ftp.vim.org/pub/vim/patches/6.1.150
-# Modified patch to not include w32 parts:
-Patch1151: ftp://ftp.vim.org/pub/vim/patches/6.1.151
-Patch1152: ftp://ftp.vim.org/pub/vim/patches/6.1.152
-Patch1153: ftp://ftp.vim.org/pub/vim/patches/6.1.153
-# 154 is MSDOS only
-Patch1157: ftp://ftp.vim.org/pub/vim/patches/6.1.157
-Patch1158: ftp://ftp.vim.org/pub/vim/patches/6.1.158
-Patch1159: ftp://ftp.vim.org/pub/vim/patches/6.1.159
-Patch1160: ftp://ftp.vim.org/pub/vim/patches/6.1.160
-Patch1161: ftp://ftp.vim.org/pub/vim/patches/6.1.161
-Patch1162: ftp://ftp.vim.org/pub/vim/patches/6.1.162
-Patch1163: ftp://ftp.vim.org/pub/vim/patches/6.1.163
-Patch1164: ftp://ftp.vim.org/pub/vim/patches/6.1.164
-Patch1165: ftp://ftp.vim.org/pub/vim/patches/6.1.165
-Patch1166: ftp://ftp.vim.org/pub/vim/patches/6.1.166
-Patch1167: ftp://ftp.vim.org/pub/vim/patches/6.1.167
-Patch1168: ftp://ftp.vim.org/pub/vim/patches/6.1.168
-Patch1169: ftp://ftp.vim.org/pub/vim/patches/6.1.169
-Patch1170: ftp://ftp.vim.org/pub/vim/patches/6.1.170
-Patch1171: ftp://ftp.vim.org/pub/vim/patches/6.1.171
-Patch1172: ftp://ftp.vim.org/pub/vim/patches/6.1.172
-# Modified patch, removed VisVim part:
-Patch1173: ftp://ftp.vim.org/pub/vim/patches/6.1.173
-Patch1174: ftp://ftp.vim.org/pub/vim/patches/6.1.174
-Patch1175: ftp://ftp.vim.org/pub/vim/patches/6.1.175
-Patch1176: ftp://ftp.vim.org/pub/vim/patches/6.1.176
-Patch1177: ftp://ftp.vim.org/pub/vim/patches/6.1.177
-Patch1178: ftp://ftp.vim.org/pub/vim/patches/6.1.178
-Patch1179: ftp://ftp.vim.org/pub/vim/patches/6.1.179
-Patch1180: ftp://ftp.vim.org/pub/vim/patches/6.1.180
-Patch1181: ftp://ftp.vim.org/pub/vim/patches/6.1.181
-Patch1182: ftp://ftp.vim.org/pub/vim/patches/6.1.182
-Patch1183: ftp://ftp.vim.org/pub/vim/patches/6.1.183
-Patch1184: ftp://ftp.vim.org/pub/vim/patches/6.1.184
-Patch1185: ftp://ftp.vim.org/pub/vim/patches/6.1.185
-Patch1186: ftp://ftp.vim.org/pub/vim/patches/6.1.186
-Patch1187: ftp://ftp.vim.org/pub/vim/patches/6.1.187
-Patch1188: ftp://ftp.vim.org/pub/vim/patches/6.1.188
-Patch1189: ftp://ftp.vim.org/pub/vim/patches/6.1.189
-Patch1190: ftp://ftp.vim.org/pub/vim/patches/6.1.190
-Patch1191: ftp://ftp.vim.org/pub/vim/patches/6.1.191
-Patch1192: ftp://ftp.vim.org/pub/vim/patches/6.1.192
-Patch1193: ftp://ftp.vim.org/pub/vim/patches/6.1.193
-Patch1194: ftp://ftp.vim.org/pub/vim/patches/6.1.194
-Patch1195: ftp://ftp.vim.org/pub/vim/patches/6.1.195
-Patch1196: ftp://ftp.vim.org/pub/vim/patches/6.1.196
-Patch1197: ftp://ftp.vim.org/pub/vim/patches/6.1.197
-Patch1198: ftp://ftp.vim.org/pub/vim/patches/6.1.198
-Patch1199: ftp://ftp.vim.org/pub/vim/patches/6.1.199
-Patch1200: ftp://ftp.vim.org/pub/vim/patches/6.1.200
-Patch1201: ftp://ftp.vim.org/pub/vim/patches/6.1.201
-Patch1202: ftp://ftp.vim.org/pub/vim/patches/6.1.202
-Patch1203: ftp://ftp.vim.org/pub/vim/patches/6.1.203
-Patch1204: ftp://ftp.vim.org/pub/vim/patches/6.1.204
-Patch1205: ftp://ftp.vim.org/pub/vim/patches/6.1.205
-Patch1206: ftp://ftp.vim.org/pub/vim/patches/6.1.206
-Patch1207: ftp://ftp.vim.org/pub/vim/patches/6.1.207
-Patch1208: ftp://ftp.vim.org/pub/vim/patches/6.1.208
-Patch1209: ftp://ftp.vim.org/pub/vim/patches/6.1.209
-Patch1210: ftp://ftp.vim.org/pub/vim/patches/6.1.210
-Patch1211: ftp://ftp.vim.org/pub/vim/patches/6.1.211
-Patch1212: ftp://ftp.vim.org/pub/vim/patches/6.1.212
-Patch1213: ftp://ftp.vim.org/pub/vim/patches/6.1.213
-Patch1214: ftp://ftp.vim.org/pub/vim/patches/6.1.214
-Patch1215: ftp://ftp.vim.org/pub/vim/patches/6.1.215
-Patch1216: ftp://ftp.vim.org/pub/vim/patches/6.1.216
-Patch1217: ftp://ftp.vim.org/pub/vim/patches/6.1.217
-Patch1218: ftp://ftp.vim.org/pub/vim/patches/6.1.218
-Patch1219: ftp://ftp.vim.org/pub/vim/patches/6.1.219
-Patch1220: ftp://ftp.vim.org/pub/vim/patches/6.1.220
-# modified patch, removed other OS stuff:
-Patch1221: ftp://ftp.vim.org/pub/vim/patches/6.1.221
-Patch1222: ftp://ftp.vim.org/pub/vim/patches/6.1.222
-# modified patch, removed other OS stuff:
-Patch1223: ftp://ftp.vim.org/pub/vim/patches/6.1.223
-Patch1224: ftp://ftp.vim.org/pub/vim/patches/6.1.224
-Patch1225: ftp://ftp.vim.org/pub/vim/patches/6.1.225
-Patch1226: ftp://ftp.vim.org/pub/vim/patches/6.1.226
-Patch1227: ftp://ftp.vim.org/pub/vim/patches/6.1.227
-# Win32 only:
-#Patch1228: ftp://ftp.vim.org/pub/vim/patches/6.1.228
-#Patch1229: ftp://ftp.vim.org/pub/vim/patches/6.1.229
-#Patch1230: ftp://ftp.vim.org/pub/vim/patches/6.1.230
-Patch1231: ftp://ftp.vim.org/pub/vim/patches/6.1.231
-Patch1232: ftp://ftp.vim.org/pub/vim/patches/6.1.232
-Patch1233: ftp://ftp.vim.org/pub/vim/patches/6.1.233
-Patch1234: ftp://ftp.vim.org/pub/vim/patches/6.1.234
-Patch1235: ftp://ftp.vim.org/pub/vim/patches/6.1.235
-Patch1236: ftp://ftp.vim.org/pub/vim/patches/6.1.236
-Patch1237: ftp://ftp.vim.org/pub/vim/patches/6.1.237
-# Modifed patch, removed w32_gui stuff:
-Patch1238: ftp://ftp.vim.org/pub/vim/patches/6.1.238
-Patch1239: ftp://ftp.vim.org/pub/vim/patches/6.1.239
-# Win32 only:
-#Patch1240: ftp://ftp.vim.org/pub/vim/patches/6.1.240
-Patch1241: ftp://ftp.vim.org/pub/vim/patches/6.1.241
-Patch1242: ftp://ftp.vim.org/pub/vim/patches/6.1.242
-# Win32 only:
-#Patch1243: ftp://ftp.vim.org/pub/vim/patches/6.1.243
-Patch1244: ftp://ftp.vim.org/pub/vim/patches/6.1.244
-Patch1245: ftp://ftp.vim.org/pub/vim/patches/6.1.245
-Patch1246: ftp://ftp.vim.org/pub/vim/patches/6.1.246
-Patch1247: ftp://ftp.vim.org/pub/vim/patches/6.1.247
-Patch1248: ftp://ftp.vim.org/pub/vim/patches/6.1.248
-Patch1249: ftp://ftp.vim.org/pub/vim/patches/6.1.249
-Patch1250: ftp://ftp.vim.org/pub/vim/patches/6.1.250
-Patch1251: ftp://ftp.vim.org/pub/vim/patches/6.1.251
-Patch1252: ftp://ftp.vim.org/pub/vim/patches/6.1.252
-# Win32 only:
-#Patch1253: ftp://ftp.vim.org/pub/vim/patches/6.1.253
-Patch1254: ftp://ftp.vim.org/pub/vim/patches/6.1.254
-Patch1255: ftp://ftp.vim.org/pub/vim/patches/6.1.255
-Patch1256: ftp://ftp.vim.org/pub/vim/patches/6.1.256
-Patch1257: ftp://ftp.vim.org/pub/vim/patches/6.1.257
-Patch1258: ftp://ftp.vim.org/pub/vim/patches/6.1.258
-# Mac only:
-#Patch1259: ftp://ftp.vim.org/pub/vim/patches/6.1.259
-Patch1260: ftp://ftp.vim.org/pub/vim/patches/6.1.260
-Patch1261: ftp://ftp.vim.org/pub/vim/patches/6.1.261
-Patch1262: ftp://ftp.vim.org/pub/vim/patches/6.1.262
-Patch1263: ftp://ftp.vim.org/pub/vim/patches/6.1.263
-Patch1264: ftp://ftp.vim.org/pub/vim/patches/6.1.264
-Patch1265: ftp://ftp.vim.org/pub/vim/patches/6.1.265
-Patch1266: ftp://ftp.vim.org/pub/vim/patches/6.1.266
-Patch1267: ftp://ftp.vim.org/pub/vim/patches/6.1.267
-Patch1268: ftp://ftp.vim.org/pub/vim/patches/6.1.268
-Patch1269: ftp://ftp.vim.org/pub/vim/patches/6.1.269
-Patch1270: ftp://ftp.vim.org/pub/vim/patches/6.1.270
-Patch1271: ftp://ftp.vim.org/pub/vim/patches/6.1.271
-Patch1272: ftp://ftp.vim.org/pub/vim/patches/6.1.272
-Patch1273: ftp://ftp.vim.org/pub/vim/patches/6.1.273
-Patch1274: ftp://ftp.vim.org/pub/vim/patches/6.1.274
-Patch1275: ftp://ftp.vim.org/pub/vim/patches/6.1.275
-Patch1276: ftp://ftp.vim.org/pub/vim/patches/6.1.276
-Patch1277: ftp://ftp.vim.org/pub/vim/patches/6.1.277
-Patch1278: ftp://ftp.vim.org/pub/vim/patches/6.1.278
-Patch1279: ftp://ftp.vim.org/pub/vim/patches/6.1.279
-Patch1280: ftp://ftp.vim.org/pub/vim/patches/6.1.280
-Patch1281: ftp://ftp.vim.org/pub/vim/patches/6.1.281
-Patch1282: ftp://ftp.vim.org/pub/vim/patches/6.1.282
-Patch1283: ftp://ftp.vim.org/pub/vim/patches/6.1.283
-Patch1284: ftp://ftp.vim.org/pub/vim/patches/6.1.284
-Patch1285: ftp://ftp.vim.org/pub/vim/patches/6.1.285
-Patch1286: ftp://ftp.vim.org/pub/vim/patches/6.1.286
-Patch1287: ftp://ftp.vim.org/pub/vim/patches/6.1.287
-Patch1288: ftp://ftp.vim.org/pub/vim/patches/6.1.288
-Patch1289: ftp://ftp.vim.org/pub/vim/patches/6.1.289
-# Patches 290-292 are Win32 only
-Patch1293: ftp://ftp.vim.org/pub/vim/patches/6.1.293
-Patch1294: ftp://ftp.vim.org/pub/vim/patches/6.1.294
-Patch1295: ftp://ftp.vim.org/pub/vim/patches/6.1.295
-# Patch 296 is Win32 only
-Patch1297: ftp://ftp.vim.org/pub/vim/patches/6.1.297
-Patch1298: ftp://ftp.vim.org/pub/vim/patches/6.1.298
-Patch1299: ftp://ftp.vim.org/pub/vim/patches/6.1.299
-# Patch 300 is Win32 only
-Patch1301: ftp://ftp.vim.org/pub/vim/patches/6.1.301
-Patch1302: ftp://ftp.vim.org/pub/vim/patches/6.1.302
-# Patches 303-304 are win32 only
-Patch1305: ftp://ftp.vim.org/pub/vim/patches/6.1.305
-Patch1306: ftp://ftp.vim.org/pub/vim/patches/6.1.306
-Patch1307: ftp://ftp.vim.org/pub/vim/patches/6.1.307
-Patch1308: ftp://ftp.vim.org/pub/vim/patches/6.1.308
-Patch1309: ftp://ftp.vim.org/pub/vim/patches/6.1.309
-Patch1310: ftp://ftp.vim.org/pub/vim/patches/6.1.310
-# patch 311 is VMS only
-Patch1312: ftp://ftp.vim.org/pub/vim/patches/6.1.312
-Patch1313: ftp://ftp.vim.org/pub/vim/patches/6.1.313
-Patch1314: ftp://ftp.vim.org/pub/vim/patches/6.1.314
-# modified patch, removed other OS stuff:
-Patch1315: ftp://ftp.vim.org/pub/vim/patches/6.1.315
-Patch1316: ftp://ftp.vim.org/pub/vim/patches/6.1.316
-Patch1317: ftp://ftp.vim.org/pub/vim/patches/6.1.317
-Patch1318: ftp://ftp.vim.org/pub/vim/patches/6.1.318
-Patch1319: ftp://ftp.vim.org/pub/vim/patches/6.1.319
-Patch1320: ftp://ftp.vim.org/pub/vim/patches/6.1.320
-
-Patch3000: vim-6.1-kh1.patch
+# (for i in `seq 1 14`; do printf "Patch%03d: ftp://ftp.vim.org/pub/vim/patches/6.2.%03d\n" $i $i; done)
+Patch001: ftp://ftp.vim.org/pub/vim/patches/6.2.001
+Patch002: ftp://ftp.vim.org/pub/vim/patches/6.2.002
+Patch003: ftp://ftp.vim.org/pub/vim/patches/6.2.003
+Patch004: ftp://ftp.vim.org/pub/vim/patches/6.2.004
+Patch005: ftp://ftp.vim.org/pub/vim/patches/6.2.005
+Patch006: ftp://ftp.vim.org/pub/vim/patches/6.2.006
+Patch007: ftp://ftp.vim.org/pub/vim/patches/6.2.007
+Patch008: ftp://ftp.vim.org/pub/vim/patches/6.2.008
+Patch009: ftp://ftp.vim.org/pub/vim/patches/6.2.009
+Patch010: ftp://ftp.vim.org/pub/vim/patches/6.2.010
+Patch011: ftp://ftp.vim.org/pub/vim/patches/6.2.011
+Patch012: ftp://ftp.vim.org/pub/vim/patches/6.2.012
+Patch013: ftp://ftp.vim.org/pub/vim/patches/6.2.013
+Patch014: ftp://ftp.vim.org/pub/vim/patches/6.2.014
+Patch015: ftp://ftp.vim.org/pub/vim/patches/6.2.015
+Patch016: ftp://ftp.vim.org/pub/vim/patches/6.2.016
+Patch017: ftp://ftp.vim.org/pub/vim/patches/6.2.017
+Patch018: ftp://ftp.vim.org/pub/vim/patches/6.2.018
+Patch019: ftp://ftp.vim.org/pub/vim/patches/6.2.019
+Patch020: ftp://ftp.vim.org/pub/vim/patches/6.2.020
+Patch021: ftp://ftp.vim.org/pub/vim/patches/6.2.021
+Patch022: ftp://ftp.vim.org/pub/vim/patches/6.2.022
+Patch023: ftp://ftp.vim.org/pub/vim/patches/6.2.023
+Patch024: ftp://ftp.vim.org/pub/vim/patches/6.2.024
+Patch025: ftp://ftp.vim.org/pub/vim/patches/6.2.025
+Patch026: ftp://ftp.vim.org/pub/vim/patches/6.2.026
+Patch027: ftp://ftp.vim.org/pub/vim/patches/6.2.027
+Patch028: ftp://ftp.vim.org/pub/vim/patches/6.2.028
+Patch029: ftp://ftp.vim.org/pub/vim/patches/6.2.029
+Patch030: ftp://ftp.vim.org/pub/vim/patches/6.2.030
+Patch031: ftp://ftp.vim.org/pub/vim/patches/6.2.031
+Patch032: ftp://ftp.vim.org/pub/vim/patches/6.2.032
+Patch033: ftp://ftp.vim.org/pub/vim/patches/6.2.033
+Patch034: ftp://ftp.vim.org/pub/vim/patches/6.2.034
+Patch035: ftp://ftp.vim.org/pub/vim/patches/6.2.035
+Patch036: ftp://ftp.vim.org/pub/vim/patches/6.2.036
+Patch037: ftp://ftp.vim.org/pub/vim/patches/6.2.037
+Patch038: ftp://ftp.vim.org/pub/vim/patches/6.2.038
+Patch039: ftp://ftp.vim.org/pub/vim/patches/6.2.039
+Patch040: ftp://ftp.vim.org/pub/vim/patches/6.2.040
+Patch041: ftp://ftp.vim.org/pub/vim/patches/6.2.041
+Patch042: ftp://ftp.vim.org/pub/vim/patches/6.2.042
+Patch043: ftp://ftp.vim.org/pub/vim/patches/6.2.043
+Patch044: ftp://ftp.vim.org/pub/vim/patches/6.2.044
+Patch045: ftp://ftp.vim.org/pub/vim/patches/6.2.045
+Patch046: ftp://ftp.vim.org/pub/vim/patches/6.2.046
+Patch047: ftp://ftp.vim.org/pub/vim/patches/6.2.047
+Patch048: ftp://ftp.vim.org/pub/vim/patches/6.2.048
+Patch049: ftp://ftp.vim.org/pub/vim/patches/6.2.049
+Patch050: ftp://ftp.vim.org/pub/vim/patches/6.2.050
+Patch051: ftp://ftp.vim.org/pub/vim/patches/6.2.051
+Patch052: ftp://ftp.vim.org/pub/vim/patches/6.2.052
+Patch053: ftp://ftp.vim.org/pub/vim/patches/6.2.053
+Patch054: ftp://ftp.vim.org/pub/vim/patches/6.2.054
+Patch055: ftp://ftp.vim.org/pub/vim/patches/6.2.055
+Patch056: ftp://ftp.vim.org/pub/vim/patches/6.2.056
+Patch057: ftp://ftp.vim.org/pub/vim/patches/6.2.057
+Patch058: ftp://ftp.vim.org/pub/vim/patches/6.2.058
+Patch059: ftp://ftp.vim.org/pub/vim/patches/6.2.059
+Patch060: ftp://ftp.vim.org/pub/vim/patches/6.2.060
+Patch061: ftp://ftp.vim.org/pub/vim/patches/6.2.061
+Patch062: ftp://ftp.vim.org/pub/vim/patches/6.2.062
+Patch063: ftp://ftp.vim.org/pub/vim/patches/6.2.063
+Patch064: ftp://ftp.vim.org/pub/vim/patches/6.2.064
+Patch065: ftp://ftp.vim.org/pub/vim/patches/6.2.065
+Patch066: ftp://ftp.vim.org/pub/vim/patches/6.2.066
+Patch067: ftp://ftp.vim.org/pub/vim/patches/6.2.067
+Patch068: ftp://ftp.vim.org/pub/vim/patches/6.2.068
+Patch069: ftp://ftp.vim.org/pub/vim/patches/6.2.069
+Patch070: ftp://ftp.vim.org/pub/vim/patches/6.2.070
+Patch071: ftp://ftp.vim.org/pub/vim/patches/6.2.071
+Patch072: ftp://ftp.vim.org/pub/vim/patches/6.2.072
+Patch073: ftp://ftp.vim.org/pub/vim/patches/6.2.073
+Patch074: ftp://ftp.vim.org/pub/vim/patches/6.2.074
+Patch075: ftp://ftp.vim.org/pub/vim/patches/6.2.075
+Patch076: ftp://ftp.vim.org/pub/vim/patches/6.2.076
+Patch077: ftp://ftp.vim.org/pub/vim/patches/6.2.077
+Patch078: ftp://ftp.vim.org/pub/vim/patches/6.2.078
+Patch079: ftp://ftp.vim.org/pub/vim/patches/6.2.079
+Patch080: ftp://ftp.vim.org/pub/vim/patches/6.2.080
+Patch081: ftp://ftp.vim.org/pub/vim/patches/6.2.081
+Patch082: ftp://ftp.vim.org/pub/vim/patches/6.2.082
+Patch083: ftp://ftp.vim.org/pub/vim/patches/6.2.083
+Patch084: ftp://ftp.vim.org/pub/vim/patches/6.2.084
+Patch085: ftp://ftp.vim.org/pub/vim/patches/6.2.085
+Patch086: ftp://ftp.vim.org/pub/vim/patches/6.2.086
+Patch087: ftp://ftp.vim.org/pub/vim/patches/6.2.087
+Patch088: ftp://ftp.vim.org/pub/vim/patches/6.2.088
+Patch089: ftp://ftp.vim.org/pub/vim/patches/6.2.089
+Patch090: ftp://ftp.vim.org/pub/vim/patches/6.2.090
+Patch091: ftp://ftp.vim.org/pub/vim/patches/6.2.091
+Patch092: ftp://ftp.vim.org/pub/vim/patches/6.2.092
+Patch093: ftp://ftp.vim.org/pub/vim/patches/6.2.093
+Patch094: ftp://ftp.vim.org/pub/vim/patches/6.2.094
+Patch095: ftp://ftp.vim.org/pub/vim/patches/6.2.095
+Patch096: ftp://ftp.vim.org/pub/vim/patches/6.2.096
+Patch097: ftp://ftp.vim.org/pub/vim/patches/6.2.097
+Patch098: ftp://ftp.vim.org/pub/vim/patches/6.2.098
+Patch099: ftp://ftp.vim.org/pub/vim/patches/6.2.099
+Patch100: ftp://ftp.vim.org/pub/vim/patches/6.2.100
+Patch101: ftp://ftp.vim.org/pub/vim/patches/6.2.101
+Patch102: ftp://ftp.vim.org/pub/vim/patches/6.2.102
+Patch103: ftp://ftp.vim.org/pub/vim/patches/6.2.103
+Patch104: ftp://ftp.vim.org/pub/vim/patches/6.2.104
+Patch105: ftp://ftp.vim.org/pub/vim/patches/6.2.105
+Patch106: ftp://ftp.vim.org/pub/vim/patches/6.2.106
+Patch107: ftp://ftp.vim.org/pub/vim/patches/6.2.107
+Patch108: ftp://ftp.vim.org/pub/vim/patches/6.2.108
+Patch109: ftp://ftp.vim.org/pub/vim/patches/6.2.109
+Patch110: ftp://ftp.vim.org/pub/vim/patches/6.2.110
+Patch111: ftp://ftp.vim.org/pub/vim/patches/6.2.111
+Patch112: ftp://ftp.vim.org/pub/vim/patches/6.2.112
+Patch113: ftp://ftp.vim.org/pub/vim/patches/6.2.113
+Patch114: ftp://ftp.vim.org/pub/vim/patches/6.2.114
+Patch115: ftp://ftp.vim.org/pub/vim/patches/6.2.115
+Patch116: ftp://ftp.vim.org/pub/vim/patches/6.2.116
+Patch117: ftp://ftp.vim.org/pub/vim/patches/6.2.117
+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
+
Patch3001: vim-6.1-syntax.patch
Patch3002: vim-6.1-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
Buildroot: %{_tmppath}/%{name}-%{version}-root
-Buildrequires: python-devel perl
+Buildrequires: python-devel perl libtermcap-devel gettext
+%if "%{withruby}" == "1"
+Buildrequires: ruby ruby-devel
+%endif
%if %{desktop_file}
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
@@ -427,7 +247,11 @@ need to install the vim-common package.
Summary: The VIM version of the vi editor for the X Window System.
Group: Applications/Editors
Requires: vim-common
+%if "%{withgtk2}" == "1"
+BuildRequires: gtk2-devel
+%else
BuildRequires: gtk+-devel
+%endif
%description X11
VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -444,346 +268,188 @@ vim-common package.
%endif
%prep
-%setup -q -b 1 -n %{vimversion}
-%patch0 -p1 -b .4.2
-%patch1 -p1 -b .vim
+%setup -q -b 1 -n %{vimdir}
+%patch2000 -p1 -b .4.2
+%patch2001 -p1 -b .vim
# fix rogue dependencies from sample code
chmod -x runtime/tools/mve.awk
-%patch2 -p1 -b .paths
+%patch2002 -p1 -b .paths
find . -name \*.paths | xargs rm -f
-%patch3 -p1 -b .fixkeys
-%patch4 -p1 -b .highlite
-%patch5 -p1 -b .crv
-%patch10 -p1 -b .xxdloc
-%patch11 -p1 -b .gcc31
+%patch2003 -p1 -b .fixkeys
+%patch2004 -p1 -b .highlite
+%patch2005 -p1 -b .crv
+%patch2010 -p1 -b .xxdloc
perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
# Base patches...
-# for i in `seq 312 320`; do echo "%patch`expr 1000 + $i` -p0 -b .pl`expr 1000 + $i | sed -e 's,^.,,'`"; done
-%patch1001 -p0
-%patch1003 -p0
-%patch1004 -p0
-%patch1005 -p0
-%patch1006 -p0
-%patch1007 -p0
-%patch1008 -p0
-%patch1009 -p0
-%patch1010 -p0
-%patch1011 -p0
-%patch1012 -p0
-%patch1013 -p0
-%patch1014 -p0
-%patch1015 -p0
-%patch1017 -p0
-%patch1018 -p0
-%patch1020 -p0
-%patch1021 -p0
-%patch1022 -p0
-%patch1024 -p0
-%patch1025 -p0
-%patch1026 -p0
-%patch1027 -p0
-%patch1028 -p0
-%patch1029 -p0
-%patch1030 -p0
-%patch1031 -p0
-%patch1032 -p0
-%patch1033 -p0
-%patch1034 -p0
-%patch1036 -p0
-%patch1037 -p0
-%patch1038 -p0
-%patch1039 -p0
-%patch1040 -p0
-%patch1041 -p0
-%patch1042 -p0
-%patch1043 -p0
-%patch1045 -p0
-%patch1046 -p0
-%patch1047 -p0
-%patch1048 -p0
-%patch1049 -p0
-%patch1051 -p0
-%patch1052 -p0
-%patch1053 -p0
-%patch1054 -p0
-%patch1055 -p0
-%patch1056 -p0
-%patch1057 -p0
-%patch1058 -p0
-%patch1059 -p0
-%patch1060 -p0
-%patch1061 -p0
-%patch1062 -p0
-%patch1063 -p0
-%patch1064 -p0
-%patch1065 -p0
-%patch1066 -p0
-%patch1067 -p0
-%patch1068 -p0
-%patch1069 -p0
-%patch1070 -p0
-%patch1071 -p0
-%patch1072 -p0
-%patch1074 -p0
-%patch1075 -p0
-%patch1077 -p0
-%patch1078 -p0
-%patch1079 -p0
-%patch1080 -p0
-%patch1081 -p0
-%patch1082 -p0
-%patch1083 -p0
-#%patch1084 -p0
-%patch1085 -p0
-%patch1086 -p0
-%patch1087 -p0
-%patch1089 -p0
-%patch1090 -p0
-%patch1091 -p0
-%patch1092 -p0
-%patch1094 -p0
-%patch1095 -p0
-%patch1096 -p0
-%patch1097 -p0
-%patch1098 -p0
-%patch1099 -p0
-%patch1101 -p0
-%patch1102 -p0
-%patch1103 -p0
-%patch1104 -p0
-%patch1105 -p0
-%patch1106 -p0
-%patch1107 -p0
-%patch1108 -p0
-%patch1109 -p0
-%patch1110 -p0
-%patch1111 -p0
-%patch1112 -p0
-%patch1113 -p0
-%patch1114 -p0
-%patch1115 -p0
-%patch1116 -p0
-%patch1117 -p0
-%patch1118 -p0
-#%patch1119 -p0
-%patch1120 -p0
-%patch1121 -p0
-%patch1122 -p0
-%patch1123 -p0
-%patch1124 -p0
-%patch1125 -p0
-%patch1126 -p0
-%patch1127 -p0
-%patch1128 -p0
-%patch1129 -p0
-%patch1130 -p0
-%patch1131 -p0
-%patch1132 -p0
-%patch1133 -p0
-%patch1134 -p0
-%patch1135 -p0
-%patch1136 -p0
-%patch1137 -p0
-%patch1138 -p0
-%patch1139 -p0
-%patch1140 -p0
-%patch1141 -p0
-%patch1142 -p0
-%patch1143 -p0
-%patch1144 -p0
-%patch1145 -p0
-%patch1146 -p0
-%patch1150 -p0
-%patch1151 -p0
-%patch1152 -p0
-%patch1153 -p0
-%patch1157 -p0
-%patch1158 -p0
-%patch1159 -p0
-%patch1160 -p0
-%patch1161 -p0
-%patch1162 -p0
-%patch1163 -p0
-%patch1164 -p0
-%patch1165 -p0
-%patch1166 -p0
-%patch1167 -p0
-%patch1168 -p0
-%patch1169 -p0
-%patch1170 -p0
-%patch1171 -p0
-%patch1172 -p0
-%patch1173 -p0
-%patch1174 -p0
-%patch1175 -p0
-%patch1176 -p0
-%patch1177 -p0
-%patch1178 -p0
-%patch1179 -p0
-%patch1180 -p0
-%patch1181 -p0
-%patch1182 -p0
-%patch1183 -p0
-# %patch1184 -p0 # Win32
-%patch1185 -p0
-%patch1186 -p0
-%patch1187 -p0
-%patch1188 -p0
-%patch1189 -p0
-# %patch1190 -p0 # VMS
-%patch1191 -p0
-%patch1192 -p0
-%patch1193 -p0
-%patch1194 -p0
-%patch1195 -p0
-# %patch1196 -p0 # Patch doesn't apply, but seems to be Mac only
-%patch1197 -p0
-# %patch1198 -p0 # This one is Mac only
-# %patch1199 -p0 # Win32
-%patch1200 -p0
-%patch1201 -p0
-# %patch1202 -p0 # Win32
-%patch1203 -p0
-%patch1204 -p0
-%patch1205 -p0
-%patch1206 -p0
-%patch1207 -p0
-%patch1208 -p0
-%patch1209 -p0
-%patch1210 -p0
-%patch1211 -p0
-%patch1212 -p0
-%patch1213 -p0
-%patch1214 -p0
-%patch1215 -p0
-%patch1216 -p0
-%patch1217 -p0
-%patch1218 -p0
-%patch1219 -p0
-%patch1220 -p0
-%patch1221 -p0
-%patch1222 -p0
-%patch1223 -p0
-%patch1224 -p0
-%patch1225 -p0
-%patch1226 -p0
-%patch1227 -p0
-#%patch1228 -p0 # Win32
-#%patch1229 -p0 # Win32
-#%patch1230 -p0 # Win16
-%patch1231 -p0
-%patch1232 -p0
-%patch1233 -p0
-%patch1234 -p0
-%patch1235 -p0
-%patch1236 -p0
-%patch1237 -p0
-%patch1238 -p0
-%patch1239 -p0
-#%patch1240 -p0 # Win32
-%patch1241 -p0
-%patch1242 -p0
-#%patch1243 -p0 # Win32
-%patch1244 -p0
-%patch1245 -p0
-%patch1246 -p0
-%patch1247 -p0
-%patch1248 -p0
-%patch1249 -p0
-%patch1250 -p0
-%patch1251 -p0
-%patch1252 -p0
-#%patch1253 -p0 # Win32
-%patch1254 -p0
-%patch1255 -p0
-%patch1256 -p0
-%patch1257 -p0
-%patch1258 -p0
-# %patch1259 -p0 # Mac
-%patch1260 -p0
-%patch1261 -p0
-%patch1262 -p0
-%patch1263 -p0
-%patch1264 -p0
-%patch1265 -p0
-%patch1266 -p0
-%patch1267 -p0
-%patch1268 -p0
-%patch1269 -p0
-%patch1270 -p0
-%patch1271 -p0
-%patch1272 -p0
-%patch1273 -p0
-%patch1274 -p0
-%patch1275 -p0
-%patch1276 -p0
-%patch1277 -p0
-%patch1278 -p0
-%patch1279 -p0
-%patch1280 -p0
-%patch1281 -p0
-%patch1282 -p0
-%patch1283 -p0
-%patch1284 -p0
-%patch1285 -p0
-%patch1286 -p0
-%patch1287 -p0
-%patch1288 -p0
-%patch1289 -p0
-%patch1293 -p0
-%patch1294 -p0
-%patch1295 -p0
-%patch1297 -p0
-%patch1298 -p0
-%patch1299 -p0
-# patch 300 is win32 only
-%patch1301 -p0
-%patch1302 -p0
-# patches 303-304 are win32 only
-%patch1305 -p0
-%patch1306 -p0
-%patch1307 -p0
-%patch1308 -p0
-%patch1309 -p0
-%patch1310 -p0
-# patch 311 is VMS only
-%patch1312 -p0 -b .pl312
-%patch1313 -p0 -b .pl313
-%patch1314 -p0 -b .pl314
-%patch1315 -p0 -b .pl315
-%patch1316 -p0 -b .pl316
-%patch1317 -p0 -b .pl317
-%patch1318 -p0 -b .pl318
-%patch1319 -p0 -b .pl319
-%patch1320 -p0 -b .pl320
-
-%patch3000 -p1 -b .kh1
+# for i in `seq 1 14`; do printf "%%patch%03d -p0 -b .pl%03d\n" $i $i; done
+%patch001 -p0
+%patch002 -p0
+%patch003 -p0
+%patch004 -p0
+%patch005 -p0
+%patch006 -p0
+%patch007 -p0
+%patch008 -p0
+# %patch009 -p0 # Win32
+%patch010 -p0
+%patch011 -p0
+%patch012 -p0
+# %patch013 -p0 # Win32
+%patch014 -p0
+%patch015 -p0
+%patch016 -p0
+%patch017 -p0
+%patch018 -p0
+%patch019 -p0
+%patch020 -p0
+%patch021 -p0
+# %patch022 -p0 # Win32
+# %patch023 -p0 # Win32
+# %patch024 -p0 # Win32
+%patch025 -p0
+%patch026 -p0
+%patch027 -p0
+%patch028 -p0
+%patch029 -p0
+%patch030 -p0
+%patch031 -p0
+%patch032 -p0
+# %patch033 -p0 # Mac
+%patch034 -p0
+%patch035 -p0
+# %patch036 -p0 # Mac
+%patch037 -p0
+# %patch038 -p0 -b .pl038 # Win32
+# %patch039 -p0 -b .pl039 # Win32
+# %patch040 -p0 -b .pl040 # Mac
+# %patch041 -p0 -b .pl041 # Win32
+# %patch042 -p0 -b .pl042 # Cygwin
+%patch043 -p0
+%patch044 -p0
+%patch045 -p0
+%patch046 -p0
+# %patch047 -p0 # Win32
+%patch048 -p0
+%patch049 -p0
+%patch050 -p0
+%patch051 -p0
+%patch052 -p0
+%patch053 -p0
+%patch054 -p0
+%patch055 -p0
+# %patch056 -p0 # Win32
+# %patch057 -p0 # Mac
+%patch058 -p0
+%patch059 -p0
+# %patch060 -p0 # Win32
+%patch061 -p0
+%patch062 -p0
+%patch063 -p0
+%patch064 -p0
+%patch065 -p0
+# %patch066 -p0
+%patch067 -p0
+%patch068 -p0
+%patch069 -p0
+%patch070 -p0
+%patch071 -p0
+%patch072 -p0
+%patch073 -p0
+%patch074 -p0
+%patch075 -p0
+%patch076 -p0
+%patch077 -p0
+%patch078 -p0
+%patch079 -p0
+%patch080 -p0
+%patch081 -p0
+%patch082 -p0
+%patch083 -p0
+%patch084 -p0
+%patch085 -p0
+%patch086 -p0
+%patch087 -p0
+%patch088 -p0
+%patch089 -p0
+# %patch090 -p0 # Win32
+%patch091 -p0
+%patch092 -p0
+%patch093 -p0
+%patch094 -p0
+%patch095 -p0
+# %patch096 -p0 # Win32
+%patch097 -p0
+%patch098 -p0
+%patch099 -p0 -b .pl099
+%patch100 -p0 -b .pl100
+%patch101 -p0 -b .pl101
+%patch102 -p0 -b .pl102
+# %patch103 -p0 # Mac
+%patch104 -p0 -b .pl104
+%patch105 -p0 -b .pl105
+%patch106 -p0 -b .pl106
+# %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
+# %patch115 -p0 # Amiga
+# %patch116 -p0 # Win
+%patch117 -p0 -b .pl117
+# %patch118 -p0 # Mac
+# %patch119 -p0 # Win
+%patch120 -p0 -b .pl120
+# %patch121 -p0 # Mac
+
+#%patch3000 -p1 -b .kh1
%patch3001 -p1 -b .syntx
%patch3002 -p1 -b .rh1
%patch3003 -p1 -b .rh2
%patch3004 -p1 -b .rh3
+%patch3005 -p1 -b .rcloc
+%patch3006 -p1 -b .rh4
%build
cd src
-perl -pi -e "s,\\\$VIMRUNTIME,/usr/share/vim/%{vimversion},g" os_unix.h
-perl -pi -e "s,\\\$VIM,/usr/share/vim/%{vimversion}/macros,g" os_unix.h
+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
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
+%if "%{withruby}" == "1"
+export RUBY_CFLAGS=-I$(ruby -r rbconfig -e 'p Config::CONFIG["archdir"]')
+%endif
-%if %{withgui}
-%configure --with-features=huge --enable-pythoninterp --enable-perlinterp --disable-tclinterp --with-x=yes --enable-gui=X11 --exec-prefix=/usr/X11R6 --enable-xim --enable-multibyte --enable-fontset --with-compiledby="<bugzilla@redhat.com>"
-perl -pi -e "s,-I/usr/local/include,,g" auto/config.mk # FIXME: remove once perl is fixed
+%if "%{withgui}" == "1"
+%configure --with-features=huge --enable-pythoninterp --enable-perlinterp \
+ --disable-tclinterp --with-x=yes --exec-prefix=/usr/X11R6 \
+ --enable-xim --enable-multibyte --enable-fontset \
+ --with-compiledby="<bugzilla@redhat.com>" \
+%if "%{withruby}" == "1"
+ --enable-rubyinterp \
+%endif
+%if "%{withgtk2}" == "1"
+ --enable-gtk2-check --enable-gui=gtk2
+%else
+ --enable-gui=gtk
+%endif
make
cp vim gvim
make clean
%endif
%configure --prefix=/usr --with-features=huge --enable-pythoninterp \
- --enable-perlinterp --disable-tclinterp --with-x=no --enable-gui=no \
- --exec-prefix=/usr --enable-multibyte --enable-fontset --with-compiledby="<bugzilla@redhat.com>"
-perl -pi -e "s,-I/usr/local/include,,g" auto/config.mk # FIXME: remove once perl is fixed
+ --enable-perlinterp --disable-tclinterp --with-x=no \
+ --enable-gui=no --exec-prefix=/usr --enable-multibyte --enable-fontset \
+ --with-compiledby="<bugzilla@redhat.com>" \
+%if "%{withruby}" == "1"
+ --enable-rubyinterp
+%endif
+
make
cp vim enhanced-vim
make clean
@@ -792,13 +458,14 @@ make clean
--enable-multibyte \
--disable-pythoninterp --disable-perlinterp --disable-tclinterp \
--with-tlib=termcap --enable-gui=no --disable-gpm --exec-prefix=/ --with-compiledby="<bugzilla@redhat.com>"
-perl -pi -e "s,-I/usr/local/include,,g" auto/config.mk # FIXME: remove once perl is fixed
+
make
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/bin
mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/vim,X11R6/bin}
+cp -f %{SOURCE5} .
cd src
%makeinstall BINDIR=/bin DESTDIR=$RPM_BUILD_ROOT
@@ -820,42 +487,42 @@ install -s -m755 enhanced-vim $RPM_BUILD_ROOT/usr/bin/vim
ln -sf vim ./usr/bin/ex
ln -sf vim ./usr/bin/rvim
ln -sf vim ./usr/bin/vimdiff
-%if "%{withgui}" == "1"
- ln -sf gvim ./usr/X11R6/bin/gview
- ln -sf gvim ./usr/X11R6/bin/gex
-%endif
- ln -sf gvim ./usr/X11R6/bin/evim
perl -pi -e "s,$RPM_BUILD_ROOT,," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1
rm -f .%{_mandir}/man1/rvim.1
ln -sf vim.1.gz .%{_mandir}/man1/vi.1.gz
ln -sf vim.1.gz .%{_mandir}/man1/rvi.1.gz
- ln -sf vim.1.gz .%{_mandir}/man1/gvim.1.gz
- ln -sf vim.1.gz .%{_mandir}/man1/evim.1.gz
ln -sf vim.1.gz .%{_mandir}/man1/rvim.1.gz
ln -sf vim.1.gz .%{_mandir}/man1/vimdiff.1.gz
%if "%{withgui}" == "1"
+ ln -sf gvim ./usr/X11R6/bin/gview
+ ln -sf gvim ./usr/X11R6/bin/gex
+ ln -sf gvim ./usr/X11R6/bin/evim
+ ln -sf gvim ./usr/X11R6/bin/gvimdiff
+ ln -sf vim.1.gz .%{_mandir}/man1/gvim.1.gz
+ ln -sf vim.1.gz .%{_mandir}/man1/gvimdiff.1.gz
ln -sf gvim ./usr/X11R6/bin/vimx
- %if %{desktop_file}
+ %if "%{desktop_file}" == "1"
mkdir -p $RPM_BUILD_ROOT/usr/share/applications
desktop-file-install --vendor net \
--dir $RPM_BUILD_ROOT/usr/share/applications \
--add-category "Application;Development;X-Red-Hat-Base" \
- %{SOURCE2}
+ %{SOURCE3}
%else
mkdir -p ./etc/X11/applnk/Applications
- cp %{SOURCE2} ./etc/X11/applnk/Applications/gvim.desktop
+ cp %{SOURCE3} ./etc/X11/applnk/Applications/gvim.desktop
%endif
+%else
+ rm -f $RPM_BUILD_ROOT/%{_mandir}/man?/evim*
%endif
- install -s -m644 %{SOURCE3} ./usr/share/vim/%{vimversion}/macros/
# ja_JP.ujis is obsolete, ja_JP.eucJP is recommended.
- ( cd ./usr/share/vim/%{vimversion}/lang; \
+ ( cd ./usr/share/vim/%{vimdir}/lang; \
ln -sf menu_ja_jp.ujis.vim menu_ja_jp.eucjp.vim )
)
# Dependency cleanups
-chmod 644 $RPM_BUILD_ROOT/usr/share/vim/%{vimversion}/doc/vim2html.pl \
- $RPM_BUILD_ROOT/usr/share/vim/%{vimversion}/tools/*.pl \
- $RPM_BUILD_ROOT/usr/share/vim/%{vimversion}/tools/vim132
+chmod 644 $RPM_BUILD_ROOT/usr/share/vim/%{vimdir}/doc/vim2html.pl \
+ $RPM_BUILD_ROOT/usr/share/vim/%{vimdir}/tools/*.pl \
+ $RPM_BUILD_ROOT/usr/share/vim/%{vimdir}/tools/vim132
chmod 644 ../runtime/doc/vim2html.pl
mkdir -p $RPM_BUILD_ROOT/etc/profile.d
@@ -869,31 +536,35 @@ cat >$RPM_BUILD_ROOT/etc/profile.d/vim.csh <<EOF
alias vi vim
EOF
chmod 0755 $RPM_BUILD_ROOT/etc/profile.d/*
-(cd ../runtime; rm -rf doc; ln -svf ../../vim/vim61/doc docs;)
+install -s -m644 %{SOURCE4} $RPM_BUILD_ROOT/etc/vimrc
+(cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;
+ mv -f macros/README.txt ../README.macros;
+ mv -f tools/README.txt ../README.tools;
+)
%clean
rm -rf $RPM_BUILD_ROOT
%files common
%defattr(-,root,root)
-%doc README*.txt runtime/macros/README.txt runtime/tools/README.txt
+%config(noreplace) /etc/vimrc
+%doc README*
%doc runtime/docs
/usr/share/vim
-%config(noreplace) /usr/share/vim/vim61/macros/vimrc
-%lang(af) /usr/share/vim/vim61/lang/af/*
-%lang(cs) /usr/share/vim/vim61/lang/cs/*
-%lang(de) /usr/share/vim/vim61/lang/de/*
-%lang(es) /usr/share/vim/vim61/lang/es/*
-%lang(fr) /usr/share/vim/vim61/lang/fr/*
-%lang(it) /usr/share/vim/vim61/lang/it/*
-%lang(ja) /usr/share/vim/vim61/lang/ja/*
-%lang(ko) /usr/share/vim/vim61/lang/ko/*
-%lang(pl) /usr/share/vim/vim61/lang/pl/*
-%lang(sk) /usr/share/vim/vim61/lang/sk/*
-%lang(uk) /usr/share/vim/vim61/lang/uk/*
-%lang(zh_CN) /usr/share/vim/vim61/lang/zh_CN/*
-%lang(zh_CN.UTF-8) /usr/share/vim/vim61/lang/zh_CN.UTF-8/*
-%lang(zh_TW) /usr/share/vim/vim61/lang/zh_TW/*
+%lang(af) /usr/share/vim/%{vimdir}/lang/af/*
+%lang(cs) /usr/share/vim/%{vimdir}/lang/cs/*
+%lang(de) /usr/share/vim/%{vimdir}/lang/de/*
+%lang(es) /usr/share/vim/%{vimdir}/lang/es/*
+%lang(fr) /usr/share/vim/%{vimdir}/lang/fr/*
+%lang(it) /usr/share/vim/%{vimdir}/lang/it/*
+%lang(ja) /usr/share/vim/%{vimdir}/lang/ja/*
+%lang(ko) /usr/share/vim/%{vimdir}/lang/ko/*
+%lang(pl) /usr/share/vim/%{vimdir}/lang/pl/*
+%lang(sk) /usr/share/vim/%{vimdir}/lang/sk/*
+%lang(uk) /usr/share/vim/%{vimdir}/lang/uk/*
+%lang(zh_CN) /usr/share/vim/%{vimdir}/lang/zh_CN/*
+%lang(zh_CN.UTF-8) /usr/share/vim/%{vimdir}/lang/zh_CN.UTF-8/*
+%lang(zh_TW) /usr/share/vim/%{vimdir}/lang/zh_TW/*
/usr/bin/xxd
%{_mandir}/man1/vim.*
%{_mandir}/man1/ex.*
@@ -926,21 +597,98 @@ rm -rf $RPM_BUILD_ROOT
%if "%{withgui}" == "1"
%files X11
%defattr(-,root,root)
-%if %{desktop_file}
+%if "%{desktop_file}" == "1"
/usr/share/applications/*
%else
/etc/X11/applnk/*/gvim.desktop
%endif
/usr/X11R6/bin/gvim
-/usr/X11R6/bin/evim
+/usr/X11R6/bin/gvimdiff
/usr/X11R6/bin/gview
/usr/X11R6/bin/gex
/usr/X11R6/bin/vimx
-%{_mandir}/man1/gvim.*
+/usr/X11R6/bin/evim
%{_mandir}/man1/evim.*
+%{_mandir}/man1/gvim*
%endif
%changelog
+* Tue Oct 14 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.121-1
+- patchlevel 121
+- fix buildrequires (#106824, #105832)
+
+* Tue Sep 16 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.98-1.1
+- rebuilt
+
+* Tue Sep 16 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.98-1
+- upstream fix for undeclared stop_insert_mode variable
+
+* Tue Sep 16 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.97-1
+- patchlevel 97, see README for descriptions
+
+* Mon Sep 01 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.71-1
+- several upstream fixes (PL 71)
+
+* Tue Aug 05 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.60-1.1
+- rebuilt
+
+* Mon Aug 04 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.60-1
+- update to fix cut&paste segfaults and UTF8 problems
+- move vimrc to /etc (#2188)
+- fix filelist
+
+* Mon Aug 04 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.57-2
+- rebuilt
+
+* Tue Jul 29 2003 Karsten Hopp <karsten@redhat.de> 1:6.2.57-1
+- update to patchlevel 57, this should take care of #100670
+
+* Thu Jul 24 2003 Karsten Hopp <karsten@redhat.de> 6.2.21-1
+- some minor upstream fixes (PL 21)
+
+* Mon Jul 14 2003 Chip Turner <cturner@redhat.com>
+- rebuild for new perl 5.8.1
+
+* Fri Jul 04 2003 Karsten Hopp <karsten@redhat.de> 6.2.18-1
+- update
+
+* Wed Jun 10 2003 Karsten Hopp <karsten@redhat.de> 6.2.14-1
+- update to 6.2
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Jun 03 2003 Karsten Hopp <karsten@redhat.de> 6.1.474-3
+- rebuild
+
+* Mon Jun 02 2003 Karsten Hopp <karsten@redhat.de> 6.1.474-2
+- initialize variable before using it
+
+* Tue May 06 2003 Karsten Hopp <karsten@redhat.de> 6.1.474-1
+- patchlevel 474
+
+* Wed Apr 23 2003 Karsten Hopp <karsten@redhat.de> 6.1.469-4
+- add gvimdiff link (#89462)
+
+* Sun Apr 20 2003 Karsten Hopp <karsten@redhat.de> 6.1.469-3
+- rebuild with vim-X11 and gtk2
+- don't hardcode ruby path (thanks to Ian Macdonald)
+
+* Fri Apr 18 2003 Karsten Hopp <karsten@redhat.de> 6.1.469-2
+- rebuild
+
+* Thu Apr 17 2003 Karsten Hopp <karsten@redhat.de> 6.1.469-1
+- enable ruby interpreter (#89045) and update to patchlevel 469
+
+* Tue Apr 01 2003 Karsten Hopp <karsten@redhat.de> 6.1.434-1
+- update to patchlevel 434
+- update gtk2 patch and disable it for now
+
+* Sun Mar 16 2003 Karsten Hopp <karsten@redhat.de> 1:6.1.406-1
+- new versioning to match the official patchlevel
+- new tarballs from the stable CVS tree to get rid of >300 patches
+- add gtk2 patch fom gvim and build gtk2 gvim
+
* Wed Feb 12 2003 Karsten Hopp <karsten@redhat.de> 1:6.1-29
- clean up vimrc (fix #84088)
- clean up specfile so that it works with vim's specfile mode