diff --git a/README.patches b/README.patches
index 6a042e9..c00d645 100644
--- a/README.patches
+++ b/README.patches
@@ -27,6 +27,7 @@ Collection of patches for Vim 6.2:
138268 6.2.101-200.gz patches 6.2.101 to 6.2.200, gzip'ed
136345 6.2.201-300.gz patches 6.2.201 to 6.2.300, gzip'ed
98866 6.2.301-400.gz patches 6.2.301 to 6.2.400, gzip'ed
+124916 6.2.401-500.gz patches 6.2.401 to 6.2.500, gzip'ed
Individual patches for Vim 6.2:
SIZE NAME FIXES
@@ -487,6 +488,81 @@ Individual patches for Vim 6.2:
2626 6.2.455 current locale confuses Python library functions
24720 6.2.456 (extra) Win32: can't handle filenames with multi-byte chars
2482 6.2.457 (after 6.2.244) wrong utf-8 to latin1 conv. when writing file
+ 2024 6.2.458 when 'virtualedit' is set "y$" does not include trailing ^M
+ 1584 6.2.459 (after 6.2.454) variable "b" cannot be assigned to
+ 1580 6.2.460 (extra, after 6.2.456) missing function prototypes
+ 2333 6.2.461 after searching "x" puts single chars in numbered registers
+ 3711 6.2.462 "%" doesn't handle backslash in a trail byte correctly
+ 9708 6.2.463 (extra) Win32: info streams are not copied properly
+ 1627 6.2.464 (extra) Amiga: gcc can't handle #ifdef in Read()
+ 1741 6.2.465 GUI: resizing the window sometimes moves it off-screen
+ 2190 6.2.466 (extra) Win32: can't compile with Borland C
+ 1866 6.2.467 (extra, after 6.2.463) Win32: compiling requires mbyte feat.
+ 21017 6.2.468 compiler warnings for shadowed variables
+ 2440 6.2.469 (extra, after 6.2.456) Win32: can't create swap file
+ 2007 6.2.470 tempname() may return name also used for shell output
+ 9596 6.2.471 configure: superfluous "-L/usr/lib", -ldl and -lw missing
+ 7260 6.2.472 window count wrong when autocommand changes buffer
+ 1621 6.2.473 using CTRL-] in a help buffer without a name causes a crash
+ 8977 6.2.474 (extra, after 6.2.456) Win32: runtime files not found
+ 9880 6.2.475 skipping over ":perl <<EOF" does not work properly
+ 1665 6.2.476 buffer reloaded after changed outside of Vim becomes readonly
+ 3021 6.2.477 remote_send(v:servername, "\<C-V>") causes Vim to hang
+ 3831 6.2.478 Win32: "gvim --remote" fails when cur. dir starts with quote
+ 2758 6.2.479 error message from recovery goes unnoticed
+ 3832 6.2.480 NetBeans: using wrong array index, reads past trailing \
+ 8210 6.2.481 cannot specify that writing breaks soft and/or hard links
+ 58209 6.2.482 isdigit() considers superscript 1 to be a digit
+ 3959 6.2.483 (extra, after 6.2.482) extra part of patch 6.2.482
+ 6545 6.2.484 MS-Windows: diff mode ignores text changes after CTRL-Z
+ 4846 6.2.485 in BufWriteCmd autocmd don't know if ! was used for ":write"
+ 4514 6.2.486 (after 6.2.482) diff for src/eval.c was missing
+ 1809 6.2.487 (extra, after 6.2.456) non-static prototype for static func
+ 1458 6.2.488 missing parenthesis in *.ch filetype detection
+ 2511 6.2.489 loading a session already opened gives a lot of prompts
+ 2045 6.2.490 two spaces in 'paragraph' do not match a dot by itself
+ 3987 6.2.491 decrementing position is wrong for multi-byte characters
+ 1569 6.2.492 after ":redraw" a message is not overwritten
+ 2906 6.2.493 using "CTRL-O @x" in Insert mode inserts the commands
+ 1953 6.2.494 fold opens in other window when moving cursor in diff mode
+ 13372 6.2.495 (extra, after 6.2.456) file dialog doesn't work on Win95
+ 6753 6.2.496 FreeBSD: with threads out-of-stack situation is not handled
+ 3973 6.2.497 (extra) only one encoding for Russian messages supported
+ 3712 6.2.498 help files in utf-8 only work when 'encoding' is "utf-8"
+ 2222 6.2.499 on journalling filesystem written file may be lost
+ 3496 6.2.500 (extra) dos install program doesn't use "diff --binary"
+ 7850 6.2.501 can't compile on MorphOS
+ 3119 6.2.502 missing message translation files breaks building
+ 3732 6.2.503 Mac: can't build with big features without GUI
+ 64022 6.2.504 various wrong indent amounts with 'cindent'
+ 2627 6.2.505 help for -P argument is missing
+ 18515 6.2.506 (extra) Win32: conversion from/to codepages doesn't work
+ 7383 6.2.507 NetBeans: missing check if connection file is world readable
+ 3410 6.2.508 Win32: value displayed for message language is wrong
+ 1668 6.2.509 (after 6.2.508) Win32: crash when $LANG is empty
+ 1561 6.2.510 (after 6.2.507) compiler warning for pointer type
+ 23509 6.2.511 cannot handle help tags in utf-8 encoding
+ 3367 6.2.512 translating "\"\n" is not very useful
+ 1990 6.2.513 (after 6.2.507) NetBeans: checking user ID is not necessary
+ 2124 6.2.514 syntax/highlight group name is not checked for invalid chars
+ 2859 6.2.515 ":options" resets global 'swapfile'
+ 11740 6.2.516 the sign column is invisible, looks like extra indent
+ 4015 6.2.517 multi-byte characters not handled well with "r" in Visual mode
+ 1944 6.2.518 display error after doing "J" and then "D"
+ 6722 6.2.519 Mac: reading and writing MacRoman files does not always work
+ 20161 6.2.520 (extra) Win32: NSIS installer is outdated
+ 1583 6.2.521 silent ex mode waits after a message that is skipped
+ 1650 6.2.522 setting 'cmdheight' while starting up causes layout problems
+ 2711 6.2.523 aborting a session leaves the user with useless windows
+ 30826 6.2.524 (extra, after 6.2.520) Win32: NSIS installer problems
+ 2432 6.2.525 crash with ":history" when history entry is very long
+ 2280 6.2.526 menu translations not found when s:lang is two characters
+ 5959 6.2.527 2html.vim does not work in combination with some autocmds
+ 5917 6.2.528 changes for "~" are not reported to NetBeans
+ 1952 6.2.529 (extra) VisVim only works for Admin
+ 1208 6.2.530 Amiga: compiler warning in version.c
+ 2923 6.2.531 can't see debug messages in silent Ex mode
+ 5825 6.2.532 (extra) can't compile with MSVC 4.1 for Win32s version
Collection of patches for Vim 6.1:
diff --git a/gvim16.png b/gvim16.png
new file mode 100644
index 0000000..b0859d6
Binary files /dev/null and b/gvim16.png differ
diff --git a/gvim32.png b/gvim32.png
new file mode 100644
index 0000000..961040c
Binary files /dev/null and b/gvim32.png differ
diff --git a/gvim48.png b/gvim48.png
new file mode 100644
index 0000000..7187664
Binary files /dev/null and b/gvim48.png differ
diff --git a/gvim64.png b/gvim64.png
new file mode 100644
index 0000000..2bdc8bd
Binary files /dev/null and b/gvim64.png differ
diff --git a/vim.spec b/vim.spec
index bf6954d..d61927d 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,3 +1,4 @@
+ExcludeArch: ppc64 ppc
%define WITH_SELINUX 1
%define desktop_file 1
%if %{desktop_file}
@@ -23,12 +24,12 @@
%define baseversion 6.2
%define vimdir vim62
-%define patchlevel 457
+%define patchlevel 532
Summary: The VIM editor.
Name: vim
Version: %{baseversion}.%{patchlevel}
-Release: 1
+Release: 3
License: freeware
Group: Applications/Editors
Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -38,6 +39,10 @@ Source3: gvim.desktop
Source4: vimrc
Source5: ftp://ftp.vim.org/pub/vim/patches/README.patches
Source6: spec.vim
+Source7: gvim16.png
+Source8: gvim32.png
+Source9: gvim48.png
+Source10: gvim64.png
Patch2000: vim-4.2-speed_t.patch
Patch2001: vim-5.1-vimnotvi.patch
Patch2002: vim-5.6a-paths.patch
@@ -505,6 +510,81 @@ Patch454: ftp://ftp.vim.org/pub/vim/patches/6.2.454
Patch455: ftp://ftp.vim.org/pub/vim/patches/6.2.455
Patch456: ftp://ftp.vim.org/pub/vim/patches/6.2.456
Patch457: ftp://ftp.vim.org/pub/vim/patches/6.2.457
+Patch458: ftp://ftp.vim.org/pub/vim/patches/6.2.458
+Patch459: ftp://ftp.vim.org/pub/vim/patches/6.2.459
+Patch460: ftp://ftp.vim.org/pub/vim/patches/6.2.460
+Patch461: ftp://ftp.vim.org/pub/vim/patches/6.2.461
+Patch462: ftp://ftp.vim.org/pub/vim/patches/6.2.462
+Patch463: ftp://ftp.vim.org/pub/vim/patches/6.2.463
+Patch464: ftp://ftp.vim.org/pub/vim/patches/6.2.464
+Patch465: ftp://ftp.vim.org/pub/vim/patches/6.2.465
+Patch466: ftp://ftp.vim.org/pub/vim/patches/6.2.466
+Patch467: ftp://ftp.vim.org/pub/vim/patches/6.2.467
+Patch468: ftp://ftp.vim.org/pub/vim/patches/6.2.468
+Patch469: ftp://ftp.vim.org/pub/vim/patches/6.2.469
+Patch470: ftp://ftp.vim.org/pub/vim/patches/6.2.470
+Patch471: ftp://ftp.vim.org/pub/vim/patches/6.2.471
+Patch472: ftp://ftp.vim.org/pub/vim/patches/6.2.472
+Patch473: ftp://ftp.vim.org/pub/vim/patches/6.2.473
+Patch474: ftp://ftp.vim.org/pub/vim/patches/6.2.474
+Patch475: ftp://ftp.vim.org/pub/vim/patches/6.2.475
+Patch476: ftp://ftp.vim.org/pub/vim/patches/6.2.476
+Patch477: ftp://ftp.vim.org/pub/vim/patches/6.2.477
+Patch478: ftp://ftp.vim.org/pub/vim/patches/6.2.478
+Patch479: ftp://ftp.vim.org/pub/vim/patches/6.2.479
+Patch480: ftp://ftp.vim.org/pub/vim/patches/6.2.480
+Patch481: ftp://ftp.vim.org/pub/vim/patches/6.2.481
+Patch482: ftp://ftp.vim.org/pub/vim/patches/6.2.482
+Patch483: ftp://ftp.vim.org/pub/vim/patches/6.2.483
+Patch484: ftp://ftp.vim.org/pub/vim/patches/6.2.484
+Patch485: ftp://ftp.vim.org/pub/vim/patches/6.2.485
+Patch486: ftp://ftp.vim.org/pub/vim/patches/6.2.486
+Patch487: ftp://ftp.vim.org/pub/vim/patches/6.2.487
+Patch488: ftp://ftp.vim.org/pub/vim/patches/6.2.488
+Patch489: ftp://ftp.vim.org/pub/vim/patches/6.2.489
+Patch490: ftp://ftp.vim.org/pub/vim/patches/6.2.490
+Patch491: ftp://ftp.vim.org/pub/vim/patches/6.2.491
+Patch492: ftp://ftp.vim.org/pub/vim/patches/6.2.492
+Patch493: ftp://ftp.vim.org/pub/vim/patches/6.2.493
+Patch494: ftp://ftp.vim.org/pub/vim/patches/6.2.494
+Patch495: ftp://ftp.vim.org/pub/vim/patches/6.2.495
+Patch496: ftp://ftp.vim.org/pub/vim/patches/6.2.496
+Patch497: ftp://ftp.vim.org/pub/vim/patches/6.2.497
+Patch498: ftp://ftp.vim.org/pub/vim/patches/6.2.498
+Patch499: ftp://ftp.vim.org/pub/vim/patches/6.2.499
+Patch500: ftp://ftp.vim.org/pub/vim/patches/6.2.500
+Patch501: ftp://ftp.vim.org/pub/vim/patches/6.2.501
+Patch502: ftp://ftp.vim.org/pub/vim/patches/6.2.502
+Patch503: ftp://ftp.vim.org/pub/vim/patches/6.2.503
+Patch504: ftp://ftp.vim.org/pub/vim/patches/6.2.504
+Patch505: ftp://ftp.vim.org/pub/vim/patches/6.2.505
+Patch506: ftp://ftp.vim.org/pub/vim/patches/6.2.506
+Patch507: ftp://ftp.vim.org/pub/vim/patches/6.2.507
+Patch508: ftp://ftp.vim.org/pub/vim/patches/6.2.508
+Patch509: ftp://ftp.vim.org/pub/vim/patches/6.2.509
+Patch510: ftp://ftp.vim.org/pub/vim/patches/6.2.510
+Patch511: ftp://ftp.vim.org/pub/vim/patches/6.2.511
+Patch512: ftp://ftp.vim.org/pub/vim/patches/6.2.512
+Patch513: ftp://ftp.vim.org/pub/vim/patches/6.2.513
+Patch514: ftp://ftp.vim.org/pub/vim/patches/6.2.514
+Patch515: ftp://ftp.vim.org/pub/vim/patches/6.2.515
+Patch516: ftp://ftp.vim.org/pub/vim/patches/6.2.516
+Patch517: ftp://ftp.vim.org/pub/vim/patches/6.2.517
+Patch518: ftp://ftp.vim.org/pub/vim/patches/6.2.518
+Patch519: ftp://ftp.vim.org/pub/vim/patches/6.2.519
+Patch520: ftp://ftp.vim.org/pub/vim/patches/6.2.520
+Patch521: ftp://ftp.vim.org/pub/vim/patches/6.2.521
+Patch522: ftp://ftp.vim.org/pub/vim/patches/6.2.522
+Patch523: ftp://ftp.vim.org/pub/vim/patches/6.2.523
+Patch524: ftp://ftp.vim.org/pub/vim/patches/6.2.524
+Patch525: ftp://ftp.vim.org/pub/vim/patches/6.2.525
+Patch526: ftp://ftp.vim.org/pub/vim/patches/6.2.526
+Patch527: ftp://ftp.vim.org/pub/vim/patches/6.2.527
+Patch528: ftp://ftp.vim.org/pub/vim/patches/6.2.528
+Patch529: ftp://ftp.vim.org/pub/vim/patches/6.2.529
+Patch530: ftp://ftp.vim.org/pub/vim/patches/6.2.530
+Patch531: ftp://ftp.vim.org/pub/vim/patches/6.2.531
+Patch532: ftp://ftp.vim.org/pub/vim/patches/6.2.532
Patch3001: vim-6.1-syntax.patch
Patch3002: vim-6.2-rh1.patch
@@ -522,9 +602,13 @@ Patch3101: vim-selinux.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root
Buildrequires: python-devel perl libtermcap-devel gettext
+Buildrequires: libacl-devel gpm-devel
%if "%{withruby}" == "1"
Buildrequires: ruby ruby-devel
%endif
+%if %{WITH_SELINUX}
+Buildrequires: libselinux-devel
+%endif
%if %{desktop_file}
Requires: /usr/bin/desktop-file-install
BuildPrereq: desktop-file-utils >= %{desktop_file_utils_version}
@@ -628,7 +712,7 @@ find . -name \*.paths | xargs rm -f
perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
# Base patches...
-# for i in `seq 1 14`; do printf "%%patch%03d -p0 -b .pl%03d\n" $i $i; done
+# for i in `seq 1 14`; do printf "%%patch%03d -p0 \n" $i; done
%patch001 -p0
%patch002 -p0
%patch003 -p0
@@ -1091,6 +1175,82 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch455 -p0
#%patch456 -p0 # Win32
%patch457 -p0
+%patch458 -p0
+%patch459 -p0
+#%patch460 -p0 # Win32
+%patch461 -p0
+%patch462 -p0
+#%patch463 -p0 # Win32
+#%patch464 -p0 # Amiga
+%patch465 -p0
+#%patch466 -p0 # Win32
+#%patch467 -p0 # Win32
+%patch468 -p0
+#%patch469 -p0 # Win32
+%patch470 -p0
+%patch471 -p0
+%patch472 -p0
+%patch473 -p0
+#%patch474 -p0 #Win32
+%patch475 -p0
+%patch476 -p0
+%patch477 -p0
+#%patch478 -p0 # Win32
+%patch479 -p0
+#%patch480 -p0 # NetBeans
+%patch481 -p0
+%patch482 -p0
+#%patch483 -p0 # Photon
+#%patch484 -p0 # Windows
+%patch485 -p0
+%patch486 -p0
+#%patch487 -p0 # Win32
+%patch488 -p0
+%patch489 -p0
+%patch490 -p0
+%patch491 -p0
+%patch492 -p0
+%patch493 -p0
+%patch494 -p0
+#%patch495 -p0 # Win32
+%patch496 -p0
+%patch497 -p0
+%patch498 -p0
+%patch499 -p0
+#%patch500 -p0 # DOS
+#%patch501 -p0 # MorphOS
+%patch502 -p0
+%patch503 -p0
+%patch504 -p0
+%patch505 -p0
+#%patch506 -p0 # Win32
+#%patch507 -p0 # NetBeans
+%patch508 -p0
+%patch509 -p0
+#%patch510 -p0 # NetBeans
+%patch511 -p0
+%patch512 -p0
+#%patch513 -p0 # NetBeans
+%patch514 -p0
+%patch515 -p0
+%patch516 -p0
+%patch517 -p0
+%patch518 -p0
+%patch519 -p0
+#%patch520 -p0 # Win32
+%patch521 -p0
+%patch522 -p0
+%patch523 -p0
+#%patch524 -p0 # Win32
+%patch525 -p0
+%patch526 -p0
+%patch527 -p0
+#Modified, removed nbdebug stuff:
+%patch528 -p0
+#%patch529 -p0 # VisVim
+%patch530 -p0
+%patch531 -p0
+#%patch532 -p0 # Win32/MSVC41
#%patch3000 -p1 -b .kh1
%patch3001 -p1 -b .syntx
@@ -1172,7 +1332,16 @@ cd src
mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/usr/bin
make installmacros DESTDIR=$RPM_BUILD_ROOT
%if "%{withgui}" == "1"
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
install -s -m755 gvim $RPM_BUILD_ROOT/usr/X11R6/bin
+install -s -m644 %{SOURCE7} \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/gvim.png
+install -s -m644 %{SOURCE8} \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/gvim.png
+install -s -m644 %{SOURCE9} \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gvim.png
+install -s -m644 %{SOURCE10} \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/gvim.png
%endif
install -s -m755 enhanced-vim $RPM_BUILD_ROOT/usr/bin/vim
@@ -1276,6 +1445,7 @@ rm -rf $RPM_BUILD_ROOT
%files minimal
%defattr(-,root,root)
+%config(noreplace) /etc/vimrc
/bin/ex
/bin/vi
/bin/view
@@ -1310,9 +1480,21 @@ rm -rf $RPM_BUILD_ROOT
/usr/X11R6/bin/evim
%{_mandir}/man1/evim.*
%{_mandir}/man1/gvim*
+%{_datadir}/icons/hicolor/*/apps/*
%endif
%changelog
+* Wed Jun 02 2004 Karsten Hopp <karsten@redhat.de> 6.2.532-3
+- rebuild
+
+* Wed Jun 02 2004 Karsten Hopp <karsten@redhat.de> 6.2.532-2
+- rebuild
+
+* Thu Jun 01 2004 Karsten Hopp <karsten@redhat.de> 6.2.532-1
+- patchlevel 532
+- include vimrc in vim-minimal (#123205)
+- add gvim icons (#110033)
+
* Wed Apr 07 2004 Karsten Hopp <karsten@redhat.de> 6.2.457-1
- patchlevel 457