This commit was manufactured by cvs2git to create branch 'RA-branch'.

Sprout from master 2002-10-31 00:22:20 UTC Michal Moskal <michal@moskal.me> '- moved from gcc-3_2-7 branch (mistake)'
Cherrypick from master 2003-01-23 19:32:49 UTC Artur Frysiak <artur@frysiak.net> '- updated to patchlevel 300':
    vim.spec -> 1.135
Delete:
    vim-CMDLINE_COMPL.patch
    vim-docpath.patch
    vim-fhs.patch
    vim-hold_gui_events.patch
    vim-libacl_fix.patch
    vim-mktemp.patch

diff --git a/vim-CMDLINE_COMPL.patch b/vim-CMDLINE_COMPL.patch
deleted file mode 100644 (file)
index 0ad89c3..0000000
--- a/vim-CMDLINE_COMPL.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru vim-5.4e.old/src/ex_docmd.c vim-5.4e/src/ex_docmd.c
---- vim-5.4e.old/src/ex_docmd.c        Tue Feb 16 21:25:54 1999
-+++ vim-5.4e/src/ex_docmd.c    Tue Feb 23 17:13:57 1999
-@@ -5902,9 +5902,7 @@
- {
-     int           mode;
-     char_u  *cmdp;
--#ifdef CMDLINE_COMPL
-     char_u  *ambigstr;
--#endif
- 
-     cmdp = eap->cmd;
-     mode = get_map_mode(&cmdp, eap->forceit || isabbrev);

diff --git a/vim-docpath.patch b/vim-docpath.patch
deleted file mode 100644 (file)
index 9ecac89..0000000
--- a/vim-docpath.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- vim-5.7/runtime/doc/vim.1.paths    Fri Aug  4 15:41:18 2000
-+++ vim-5.7/runtime/doc/vim.1  Fri Aug  4 15:49:02 2000
-@@ -350,42 +350,42 @@
- ":help syntax.txt".
- .SH FILES
- .TP 15
--/usr/local/lib/vim/doc/*.txt
-+/usr/share/vim/doc/*.txt
- The
- .B Vim
- documentation files.
- Use ":help doc-file-list" to get the complete list.
- .TP
--/usr/local/lib/vim/doc/tags
-+/usr/share/vim/doc/tags
- The tags file used for finding information in the documentation files.
- .TP
--/usr/local/lib/vim/syntax/syntax.vim
-+/usr/share/vim/syntax/syntax.vim
- System wide syntax initializations.
- .TP
--/usr/local/lib/vim/syntax/*.vim
-+/usr/share/vim/syntax/*.vim
- Syntax files for various languages.
- .TP
--/usr/local/lib/vim/vimrc
-+/etc/vim/vimrc
- System wide
- .B Vim
- initializations.
- .TP
--/usr/local/lib/vim/gvimrc
-+/etc/vim/gvimrc
- System wide gvim initializations.
- .TP
--/usr/local/lib/vim/optwin.vim
-+/usr/share/vim/optwin.vim
- Script used for the ":options" command, a nice way to view and set options.
- .TP
--/usr/local/lib/vim/menu.vim
-+/usr/share/vim/menu.vim
- System wide menu initializations for gvim.
- .TP
--/usr/local/lib/vim/bugreport.vim
-+/usr/share/vim/bugreport.vim
- Script to generate a bug report.  See ":help bugs".
- .TP
--/usr/local/lib/vim/filetype.vim
-+/usr/share/vim/filetype.vim
- Script to detect the type of a file by its name.  See ":help 'filetype'".
- .TP
--/usr/local/lib/vim/scripts.vim
-+/usr/share/vim/scripts.vim
- Script to detect the type of a file by its contents.  See ":help 'filetype'".
- .PP
- For recent info read the VIM home page:

diff --git a/vim-fhs.patch b/vim-fhs.patch
deleted file mode 100644 (file)
index d25b641..0000000
--- a/vim-fhs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur vim-5.4k/src/os_unix.h vim-5.4k.pld/src/os_unix.h
---- vim-5.4k/src/os_unix.h     Tue May 11 17:42:25 1999
-+++ vim-5.4k.pld/src/os_unix.h Sun Jun 13 17:55:19 1999
-@@ -243,7 +243,7 @@
- # ifdef OS2
- #  define DEF_BDIR    ".,c:/tmp,~/tmp,~/"
- # else
--#  define DEF_BDIR    ".,~/tmp,~/"    /* default for 'backupdir' */
-+#  define DEF_BDIR    ".,~/tmp,/var/lib/vim"  /* default for 'backupdir' */
- # endif
- #endif
- 
-@@ -251,7 +251,7 @@
- # ifdef OS2
- #  define DEF_DIR     ".,~/tmp,c:/tmp,/tmp"
- # else
--#  define DEF_DIR     ".,~/tmp,/var/tmp,/tmp" /* default for 'directory' */
-+#  define DEF_DIR     ".,~/tmp,/var/lib/vim,/var/tmp,/tmp"    /* default for 'directory' */
- # endif
- #endif
- 
-@@ -259,7 +259,7 @@
- #ifdef OS2
- # define MAKEEF               "vim##.err"
- #else
--# define MAKEEF               "/tmp/vim##.err"
-+# define MAKEEF               "~/tmp/vim##.err"
- #endif
- 
- #ifdef OS2

diff --git a/vim-hold_gui_events.patch b/vim-hold_gui_events.patch
deleted file mode 100644 (file)
index 6d6f356..0000000
--- a/vim-hold_gui_events.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/globals.h.old  Tue Jan  5 20:10:00 1999
-+++ src/globals.h      Wed Jan 13 13:54:46 1999
-@@ -215,7 +215,9 @@
- /* found "-rv" or "-reverse" in command line args */
- EXTERN int    found_reverse_arg INIT(= FALSE);
- EXTERN char * font_opt INIT(= NULL);
-+#endif
- 
-+#if defined(USE_GUI) || defined(GPM_MOUSE)
- /*
-  * While executing external commands or in Ex mode, should not insert GUI
-  * events in the input buffer: Set hold_gui_events to non-zero.

diff --git a/vim-libacl_fix.patch b/vim-libacl_fix.patch
deleted file mode 100644 (file)
index f1f9b49..0000000
--- a/vim-libacl_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- vim61/src/configure.in~    Mon Sep 30 08:19:44 2002
-+++ vim61/src/configure.in     Mon Sep 30 08:19:44 2002
-@@ -1764,9 +1764,9 @@
-       AC_MSG_RESULT(yes); AC_DEFINE(HAVE_NL_LANGINFO_CODESET),
-       AC_MSG_RESULT(no))
- 
--dnl Link with -lposix1e for ACL stuff; if not found, try -lacl for SGI
--AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"],
--      AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl"],,),)
-+dnl dnl Link with -lposix1e for ACL stuff; if not found, try -lacl for SGI
-+dnl AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"],
-+dnl   AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl"],,),)
- 
- AC_MSG_CHECKING(for POSIX ACL support)
- AC_TRY_LINK([

diff --git a/vim-mktemp.patch b/vim-mktemp.patch
deleted file mode 100644 (file)
index d229862..0000000
--- a/vim-mktemp.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- vim-5.7/src/vimtutor       Mon Dec 27 09:27:02 1999
-+++ vim-5.7.acme/src/vimtutor  Thu Sep 14 13:40:49 2000
-@@ -3,7 +3,11 @@
- # Start Vim on a copy of the tutor file.
- 
- # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME
--TUTORCOPY=/tmp/tutor$$
-+#
-+# Tue Aug 24 12:30:09 EST 1999 - Conectiva
-+# - fixed tmp race
-+#
-+TUTORCOPY=`mktemp ${TMPDIR:-/tmp}/tutorXXXXXX`
- export TUTORCOPY
- vim -u NONE -c 'e $VIMRUNTIME/tutor/tutor' -c 'w! $TUTORCOPY' -c 'q'
- 

diff --git a/vim.spec b/vim.spec
index 72a93692ab76186987e25863faf6b121db6a14fd..f28b0bd4602553be92d7cd034aa84deaad63e586 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -11,7 +11,7 @@
 # _with_tcl            - with tcl interp
 
 %define                _ver            6.1
-%define                _patchlevel     212
+%define                _patchlevel     300
 
 Summary:       Vi IMproved - a Vi clone
 Summary(de):   VIsual editor iMproved
@@ -24,7 +24,7 @@ Summary(tr):  Geli
 Summary(uk):   Visual editor IMproved - ´ÄÉÎÏ ÷¦ÒÎÉÊ òÅÄÁËÔÏÒ :)
 Name:          vim
 Version:       %{_ver}.%{_patchlevel}
-Release:       4
+Release:       1
 Epoch:         4
 License:       Charityware
 Group:         Applications/Editors/Vim
@@ -223,6 +223,8 @@ Summary:    Vim with ispell support
 Summary(pl):   Vim z wsparciem dla ispella
 Group:         Applications/Editors/Vim
 Requires:      %{name}-rt = %{version}
+Conflicts:     ispell < 3.2.06
+Conflicts:     ispell-pl < 20021127-2
 
 %description ispell
 Text editor similar to Vi. This version is built with ispell support.