diff --git a/vim-manpagefixes-948566.patch b/vim-manpagefixes-948566.patch index bc4d152d..6f495600 100644 --- a/vim-manpagefixes-948566.patch +++ b/vim-manpagefixes-948566.patch @@ -1,80 +1,38 @@ -diff --git a/runtime/doc/vim-fr.1 b/runtime/doc/vim-fr.1 -index 209ab91..356cb59 100644 ---- a/runtime/doc/vim-fr.1 -+++ b/runtime/doc/vim-fr.1 -@@ -24,6 +24,7 @@ vim \- Vi IMproved, - .PP - .br - .B ex -+.B gex - .br - .B view - .br -diff --git a/runtime/doc/vim-fr.UTF-8.1 b/runtime/doc/vim-fr.UTF-8.1 -index 67be106..30b926c 100644 ---- a/runtime/doc/vim-fr.UTF-8.1 -+++ b/runtime/doc/vim-fr.UTF-8.1 -@@ -24,6 +24,7 @@ vim \- Vi IMproved, éditeur de texte pour programmeurs - .PP - .br - .B ex -+.B gex - .br - .B view - .br -diff --git a/runtime/doc/vim-it.1 b/runtime/doc/vim-it.1 -index 0ab3eff..d3af003 100755 ---- a/runtime/doc/vim-it.1 -+++ b/runtime/doc/vim-it.1 -@@ -17,6 +17,7 @@ vim \- VI Migliorato, un editor di testi per programmatori - .PP - .br - .B ex -+.B gex - .br - .B view - .br -diff --git a/runtime/doc/vim-it.UTF-8.1 b/runtime/doc/vim-it.UTF-8.1 -index 51e7e04..bfafa36 100644 ---- a/runtime/doc/vim-it.UTF-8.1 -+++ b/runtime/doc/vim-it.UTF-8.1 -@@ -17,6 +17,7 @@ vim \- VI Migliorato, un editor di testi per programmatori - .PP - .br - .B ex -+.B gex - .br - .B view - .br -diff --git a/runtime/doc/vim-pl.1 b/runtime/doc/vim-pl.1 -index d506b33..cf6ffeb 100644 ---- a/runtime/doc/vim-pl.1 -+++ b/runtime/doc/vim-pl.1 -@@ -17,6 +17,7 @@ vim \- Vi rozbudowany, edytor tekstu dla programisty - .PP - .br - .B ex -+.B gex - .br - .B view - .br -diff --git a/runtime/doc/vim-pl.UTF-8.1 b/runtime/doc/vim-pl.UTF-8.1 -index f3551d2..01650e9 100644 ---- a/runtime/doc/vim-pl.UTF-8.1 -+++ b/runtime/doc/vim-pl.UTF-8.1 -@@ -17,6 +17,7 @@ vim \- Vi rozbudowany, edytor tekstu dla programisty - .PP - .br - .B ex -+.B gex - .br - .B view - .br -diff --git a/runtime/doc/vim-ru.1 b/runtime/doc/vim-ru.1 -index dfcb3ec..aa569d5 100644 ---- a/runtime/doc/vim-ru.1 -+++ b/runtime/doc/vim-ru.1 -@@ -17,11 +17,14 @@ vim \- Vi IMproved ( +diff -up vim73/runtime/doc/vim.man.rh1 vim73/runtime/doc/vim.man +--- vim73/runtime/doc/vim.man.rh1 2013-07-26 11:26:20.566576864 +0200 ++++ vim73/runtime/doc/vim.man 2013-07-26 11:47:42.061351469 +0200 +@@ -11,9 +11,9 @@ SYNOPSIS + vim [options] -t tag + vim [options] -q [errorfile] + +- ex ++ ex gex + view +- gvim gview evim eview ++ gvim gview vimx evim eview + rvim rview rgvim rgview + + DESCRIPTION +@@ -79,8 +79,13 @@ DESCRIPTION + the files. Can also be done with the "-R" argument. + + gvim gview +- The GUI version. Starts a new window. Can also be done with +- the "-g" argument. ++ The GUI version. Starts a new window. ++ ++ gex Starts a new gvim window in Ex mode. Can also be done with ++ the "-e" argument to gvim. ++ ++ vimx Starts gvim in "Vi" mode similar to "vim", but with ++ additional features like xterm clipboard support. + + evim eview + The GUI version in easy mode. Starts a new window. Can also +diff -urN vim73/runtime/doc/vim.1 vim73_new/runtime/doc/vim.1 +--- vim73/runtime/doc/vim.1 2013-07-31 14:13:01.039765800 +0200 ++++ vim73_new/runtime/doc/vim.1 2013-07-31 13:57:59.861912768 +0200 +@@ -17,11 +17,13 @@ .PP .br .B ex @@ -84,43 +42,11 @@ index dfcb3ec..aa569d5 100644 .br .B gvim .B gview -+.B evim -+.B eview ++.B vimx + .B evim + .B eview .br - .B rvim - .B rview -diff --git a/runtime/doc/vim-ru.UTF-8.1 b/runtime/doc/vim-ru.UTF-8.1 -index ef52721..1217b7d 100644 ---- a/runtime/doc/vim-ru.UTF-8.1 -+++ b/runtime/doc/vim-ru.UTF-8.1 -@@ -17,11 +17,14 @@ vim \- Vi IMproved (Улучшенный Vi), текстовый редакто - .PP - .br - .B ex -+.B gex - .br - .B view - .br - .B gvim - .B gview -+.B evim -+.B eview - .br - .B rvim - .B rview -diff --git a/runtime/doc/vim.1 b/runtime/doc/vim.1 -index 48a121b..aaab06d 100644 ---- a/runtime/doc/vim.1 -+++ b/runtime/doc/vim.1 -@@ -17,6 +17,7 @@ vim \- Vi IMproved, a programmer's text editor - .PP - .br - .B ex -+.B gex - .br - .B view - .br -@@ -114,7 +115,9 @@ Can also be done with the "\-R" argument. +@@ -114,7 +116,12 @@ gvim gview The GUI version. Starts a new window. @@ -128,10 +54,13 @@ index 48a121b..aaab06d 100644 +.TP +gex +Starts a new gvim window in Ex mode. Can also be done with the "-e" argument to gvim ++.TP ++vimx ++Starts gvim in "Vi" mode similar to "vim", but with additional features like xterm clipboard support .TP evim eview The GUI version in easy mode. -@@ -449,6 +452,12 @@ As \-\-remote, but Vim does not exit until the files have been edited. +@@ -458,6 +458,12 @@ \-\-remote\-wait\-silent As \-\-remote\-wait, but without the warning when no server is found. .TP @@ -144,115 +73,166 @@ index 48a121b..aaab06d 100644 \-\-serverlist List the names of all Vim servers that can be found. .TP -diff --git a/runtime/doc/vim.man b/runtime/doc/vim.man -index 5cd751f..6b2cc75 100644 ---- a/runtime/doc/vim.man -+++ b/runtime/doc/vim.man -@@ -11,7 +11,7 @@ SYNOPSIS - vim [options] -t tag - vim [options] -q [errorfile] +diff -urN vim73/runtime/doc/vim-fr.1 vim73_new/runtime/doc/vim-fr.1 +--- vim73/runtime/doc/vim-fr.1 2010-05-15 13:04:00.000000000 +0200 ++++ vim73_new/runtime/doc/vim-fr.1 2013-07-31 13:59:10.587467916 +0200 +@@ -24,11 +24,13 @@ + .PP + .br + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx + .B evim + .B eview + .br +diff -urN vim73/runtime/doc/vim-fr.UTF-8.1 vim73_new/runtime/doc/vim-fr.UTF-8.1 +--- vim73/runtime/doc/vim-fr.UTF-8.1 2010-05-15 13:04:00.000000000 +0200 ++++ vim73_new/runtime/doc/vim-fr.UTF-8.1 2013-07-31 13:59:28.394852347 +0200 +@@ -24,11 +24,13 @@ + .PP + .br + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx + .B evim + .B eview + .br +diff -urN vim73/runtime/doc/vim-it.1 vim73_new/runtime/doc/vim-it.1 +--- vim73/runtime/doc/vim-it.1 2010-07-27 22:22:52.000000000 +0200 ++++ vim73_new/runtime/doc/vim-it.1 2013-07-31 13:59:43.474331077 +0200 +@@ -17,11 +17,13 @@ + .PP + .br + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx + .B evim + .B eview + .br +diff -urN vim73/runtime/doc/vim-it.UTF-8.1 vim73_new/runtime/doc/vim-it.UTF-8.1 +--- vim73/runtime/doc/vim-it.UTF-8.1 2010-07-30 20:53:57.000000000 +0200 ++++ vim73_new/runtime/doc/vim-it.UTF-8.1 2013-07-31 13:59:55.985898573 +0200 +@@ -17,11 +17,13 @@ + .PP + .br + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx + .B evim + .B eview + .br +diff -urN vim73/runtime/doc/vim.man vim73_new/runtime/doc/vim.man +--- vim73/runtime/doc/vim.man 2013-07-31 14:13:01.044765627 +0200 ++++ vim73_new/runtime/doc/vim.man 2013-07-31 13:53:35.107064804 +0200 +@@ -82,10 +82,10 @@ + The GUI version. Starts a new window. -- ex -+ ex gex - view - gvim gview evim eview - rvim rview rgvim rgview -@@ -79,8 +79,10 @@ DESCRIPTION - the files. Can also be done with the "-R" argument. - - gvim gview -- The GUI version. Starts a new window. Can also be done with -- the "-g" argument. -+ The GUI version. Starts a new window. -+ -+ gex Starts a new gvim window in Ex mode. Can also be done with + gex Starts a new gvim window in Ex mode. Can also be done with +- the "-e" argument to gvim. + the "-e" argument to gvim + vimx Starts gvim in "Vi" mode similar to "vim", but with +- additional features like xterm clipboard support. ++ additional features like xterm clipboard support + evim eview The GUI version in easy mode. Starts a new window. Can also -diff --git a/runtime/doc/vimtutor-it.1 b/runtime/doc/vimtutor-it.1 -index b5c1e61..fa9dae7 100755 ---- a/runtime/doc/vimtutor-it.1 -+++ b/runtime/doc/vimtutor-it.1 -@@ -4,6 +4,8 @@ vimtutor \- Un breve corso per imparare Vim - .SH SINTASSI +diff -urN vim73/runtime/doc/vim-pl.1 vim73_new/runtime/doc/vim-pl.1 +--- vim73/runtime/doc/vim-pl.1 2010-05-15 13:04:01.000000000 +0200 ++++ vim73_new/runtime/doc/vim-pl.1 2013-07-31 14:00:21.282024131 +0200 +@@ -17,11 +17,13 @@ + .PP .br - .B vimtutor [\-g] [lingua] -+.br -+.B gvimtutor - .SH DESCRIZIONE - .B Vimtutor - inizia il -diff --git a/runtime/doc/vimtutor-it.UTF-8.1 b/runtime/doc/vimtutor-it.UTF-8.1 -index a33dcb0..8520d14 100644 ---- a/runtime/doc/vimtutor-it.UTF-8.1 -+++ b/runtime/doc/vimtutor-it.UTF-8.1 -@@ -4,6 +4,8 @@ vimtutor \- Un breve corso per imparare Vim - .SH SINTASSI + .B ex ++.B gex .br - .B vimtutor [\-g] [lingua] -+.br -+.B gvimtutor - .SH DESCRIZIONE - .B Vimtutor - inizia il -diff --git a/runtime/doc/vimtutor-pl.1 b/runtime/doc/vimtutor-pl.1 -index e603ca5..ce6b0bc 100644 ---- a/runtime/doc/vimtutor-pl.1 -+++ b/runtime/doc/vimtutor-pl.1 -@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima - .SH SYNOPSIS + .B view .br - .B vimtutor -g [jzyk] -+.br -+.B gvimtutor - .SH OPIS - .B Vimtutor - uruchamia nauczyciela -diff --git a/runtime/doc/vimtutor-pl.UTF-8.1 b/runtime/doc/vimtutor-pl.UTF-8.1 -index 199fcd0..3b35fb4 100644 ---- a/runtime/doc/vimtutor-pl.UTF-8.1 -+++ b/runtime/doc/vimtutor-pl.UTF-8.1 -@@ -4,6 +4,8 @@ vimtutor \- nauczyciel Vima - .SH SYNOPSIS + .B gvim + .B gview ++.B vimx + .B evim + .B eview .br - .B vimtutor -g [język] -+.br -+.B gvimtutor - .SH OPIS - .B Vimtutor - uruchamia nauczyciela -diff --git a/runtime/doc/vimtutor-ru.1 b/runtime/doc/vimtutor-ru.1 -index fa3c5d9..a4f3eab 100644 ---- a/runtime/doc/vimtutor-ru.1 -+++ b/runtime/doc/vimtutor-ru.1 -@@ -4,6 +4,8 @@ vimtutor \- - .SH +diff -urN vim73/runtime/doc/vim-pl.UTF-8.1 vim73_new/runtime/doc/vim-pl.UTF-8.1 +--- vim73/runtime/doc/vim-pl.UTF-8.1 2010-05-15 13:37:38.000000000 +0200 ++++ vim73_new/runtime/doc/vim-pl.UTF-8.1 2013-07-31 14:00:36.056513402 +0200 +@@ -17,11 +17,13 @@ + .PP .br - .B vimtutor [] -+.br -+.B gvimtutor - .SH - - .B vimtutor -diff --git a/runtime/doc/vimtutor-ru.UTF-8.1 b/runtime/doc/vimtutor-ru.UTF-8.1 -index 6b1ba90..305d737 100644 ---- a/runtime/doc/vimtutor-ru.UTF-8.1 -+++ b/runtime/doc/vimtutor-ru.UTF-8.1 -@@ -7,6 +7,8 @@ vimtutor \- учебник по Vim - .SH ОПИСАНИЕ - Команда - .B vimtutor -+.br -+.B gvimtutor - запускает учебник по - .B Vim. - При этом сначала происходит создание копии файла учебника, -diff --git a/runtime/doc/vimtutor.1 b/runtime/doc/vimtutor.1 -index 0aa7e8d..6a6f6f6 100644 ---- a/runtime/doc/vimtutor.1 -+++ b/runtime/doc/vimtutor.1 -@@ -4,6 +4,8 @@ vimtutor \- the Vim tutor + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx + .B evim + .B eview + .br +diff -urN vim73/runtime/doc/vim-ru.1 vim73_new/runtime/doc/vim-ru.1 +--- vim73/runtime/doc/vim-ru.1 2010-05-15 13:04:00.000000000 +0200 ++++ vim73_new/runtime/doc/vim-ru.1 2013-07-31 14:01:10.071337568 +0200 +@@ -17,11 +17,15 @@ + .PP + .br + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx ++.B evim ++.B eview + .br + .B rvim + .B rview +diff -urN vim73/runtime/doc/vim-ru.UTF-8.1 vim73_new/runtime/doc/vim-ru.UTF-8.1 +--- vim73/runtime/doc/vim-ru.UTF-8.1 2010-05-15 13:04:00.000000000 +0200 ++++ vim73_new/runtime/doc/vim-ru.UTF-8.1 2013-07-31 14:01:34.494493301 +0200 +@@ -17,11 +17,15 @@ + .PP + .br + .B ex ++.B gex + .br + .B view + .br + .B gvim + .B gview ++.B vimx ++.B evim ++.B eview + .br + .B rvim + .B rview +diff -urN vim73/runtime/doc/vimtutor.1 vim73_new/runtime/doc/vimtutor.1 +--- vim73/runtime/doc/vimtutor.1 2010-05-15 13:04:00.000000000 +0200 ++++ vim73_new/runtime/doc/vimtutor.1 2013-07-31 14:10:10.093671964 +0200 +@@ -4,6 +4,8 @@ .SH SYNOPSIS .br .B vimtutor [\-g] [language] @@ -261,11 +241,34 @@ index 0aa7e8d..6a6f6f6 100644 .SH DESCRIPTION .B Vimtutor starts the -diff --git a/runtime/doc/vimtutor.man b/runtime/doc/vimtutor.man -index 9f2350a..e0114ca 100644 ---- a/runtime/doc/vimtutor.man -+++ b/runtime/doc/vimtutor.man -@@ -7,6 +7,7 @@ NAME +diff -urN vim73/runtime/doc/vimtutor-it.1 vim73_new/runtime/doc/vimtutor-it.1 +--- vim73/runtime/doc/vimtutor-it.1 2010-07-27 22:35:32.000000000 +0200 ++++ vim73_new/runtime/doc/vimtutor-it.1 2013-07-31 14:10:33.564861055 +0200 +@@ -4,6 +4,8 @@ + .SH SINTASSI + .br + .B vimtutor [\-g] [lingua] ++.br ++.B gvimtutor + .SH DESCRIZIONE + .B Vimtutor + inizia il +diff -urN vim73/runtime/doc/vimtutor-it.UTF-8.1 vim73_new/runtime/doc/vimtutor-it.UTF-8.1 +--- vim73/runtime/doc/vimtutor-it.UTF-8.1 2010-07-30 20:53:57.000000000 +0200 ++++ vim73_new/runtime/doc/vimtutor-it.UTF-8.1 2013-07-31 14:10:40.483622016 +0200 +@@ -4,6 +4,8 @@ + .SH SINTASSI + .br + .B vimtutor [\-g] [lingua] ++.br ++.B gvimtutor + .SH DESCRIZIONE + .B Vimtutor + inizia il +diff -urN vim73/runtime/doc/vimtutor.man vim73_new/runtime/doc/vimtutor.man +--- vim73/runtime/doc/vimtutor.man 2010-05-15 13:04:00.000000000 +0200 ++++ vim73_new/runtime/doc/vimtutor.man 2013-07-31 14:11:04.786782356 +0200 +@@ -7,6 +7,7 @@ SYNOPSIS vimtutor [-g] [language] @@ -273,3 +276,51 @@ index 9f2350a..e0114ca 100644 DESCRIPTION Vimtutor starts the Vim tutor. It copies the tutor file first, so that +diff -urN vim73/runtime/doc/vimtutor-pl.1 vim73_new/runtime/doc/vimtutor-pl.1 +--- vim73/runtime/doc/vimtutor-pl.1 2010-05-15 13:04:00.000000000 +0200 ++++ vim73_new/runtime/doc/vimtutor-pl.1 2013-07-31 14:11:13.602477777 +0200 +@@ -4,6 +4,8 @@ + .SH SYNOPSIS + .br + .B vimtutor -g [jzyk] ++.br ++.B gvimtutor + .SH OPIS + .B Vimtutor + uruchamia nauczyciela +diff -urN vim73/runtime/doc/vimtutor-pl.UTF-8.1 vim73_new/runtime/doc/vimtutor-pl.UTF-8.1 +--- vim73/runtime/doc/vimtutor-pl.UTF-8.1 2010-05-15 13:04:00.000000000 +0200 ++++ vim73_new/runtime/doc/vimtutor-pl.UTF-8.1 2013-07-31 14:11:20.571237009 +0200 +@@ -4,6 +4,8 @@ + .SH SYNOPSIS + .br + .B vimtutor -g [język] ++.br ++.B gvimtutor + .SH OPIS + .B Vimtutor + uruchamia nauczyciela +diff -urN vim73/runtime/doc/vimtutor-ru.1 vim73_new/runtime/doc/vimtutor-ru.1 +--- vim73/runtime/doc/vimtutor-ru.1 2010-05-15 13:04:00.000000000 +0200 ++++ vim73_new/runtime/doc/vimtutor-ru.1 2013-07-31 14:11:35.673715221 +0200 +@@ -4,6 +4,8 @@ + .SH + .br + .B vimtutor [] ++.br ++.B gvimtutor + .SH + + .B vimtutor +diff -urN vim73/runtime/doc/vimtutor-ru.UTF-8.1 vim73_new/runtime/doc/vimtutor-ru.UTF-8.1 +--- vim73/runtime/doc/vimtutor-ru.UTF-8.1 2010-05-15 13:04:00.000000000 +0200 ++++ vim73_new/runtime/doc/vimtutor-ru.UTF-8.1 2013-07-31 14:11:46.649335999 +0200 +@@ -7,6 +7,8 @@ + .SH ОПИСАНИЕ + Команда + .B vimtutor ++.br ++.B gvimtutor + запускает учебник по + .B Vim. + При этом сначала происходит создание копии файла учебника, diff --git a/vim.spec b/vim.spec index 5c84daae..5460ca08 100644 --- a/vim.spec +++ b/vim.spec @@ -458,6 +458,7 @@ EOF ln -sf vi ./%{_bindir}/rview ln -sf vi ./%{_bindir}/view ln -sf vi ./%{_bindir}/ex + ln -sf gvim ./%{_bindir}/vimx ln -sf vim ./%{_bindir}/rvim ln -sf vim ./%{_bindir}/vimdiff perl -pi -e "s,%{buildroot},," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1 @@ -560,7 +561,7 @@ for i in fr.UTF-8 it.UTF-8 pl.UTF-8 da.UTF-8 de.UTF-8; do rm -rf %{buildroot}/%{_mandir}/$i done -for i in rvim.1 gvim.1 gex.1 gview.1; do +for i in rvim.1 gvim.1 gex.1 gview.1 vimx.1; do echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man1/$i done echo ".so man1/vimdiff.1" > %{buildroot}/%{_mandir}/man1/gvimdiff.1 @@ -656,6 +657,7 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_mandir}/man1/vim.* %{_mandir}/man1/vimdiff.* %{_mandir}/man1/vimtutor.* +%{_mandir}/man1/vimx.* %{_mandir}/man1/xxd.* %{_mandir}/man5/vimrc.* %lang(fr) %{_mandir}/fr/man1/* @@ -779,15 +781,15 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %{_bindir}/gview %{_bindir}/gex %{_bindir}/vimtutor +%{_bindir}/vimx %{_bindir}/evim %{_mandir}/man1/evim.* %{_datadir}/icons/hicolor/*/apps/* %{_datadir}/icons/locolor/*/apps/* %changelog -* Wed Aug 21 2019 Zdenek Dohnal - 2:8.1.1890-2 -- remove vimx completely, because it is downstream symlink, which does not - work correctly anymore +* Fri Aug 23 2019 Zdenek Dohnal - 2:8.1.1890-2 +- revert vimx removal * Tue Aug 20 2019 Zdenek Dohnal - 2:8.1.1890-1 - patchlevel 1890