From 5432e80e70798c1c01df380ba4e5ab5f7c92eef1 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Jul 31 2013 10:02:55 +0000
Subject: Merge remote-tracking branch 'fedora/f19' into rhel-7.0


---

diff --git a/vim-manpagefixes-948566.patch b/vim-manpagefixes-948566.patch
new file mode 100644
index 0000000..8d7973b
--- /dev/null
+++ b/vim-manpagefixes-948566.patch
@@ -0,0 +1,31 @@
+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 --git a/vim.spec b/vim.spec
index eb3a14f..c2b2839 100644
--- a/vim.spec
+++ b/vim.spec
@@ -24,7 +24,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -1384,6 +1384,7 @@ Patch3012: vim-7.3-bug816848.patch
 Patch3013: vim-7.3-manpage-typo-668894-675480.patch
 Patch3014: vim-7.3-rubyversion.patch
 Patch3015: vim-7.3-xsubpp-path.patch
+Patch3016: vim-manpagefixes-948566.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python-devel ncurses-devel gettext perl-devel
@@ -2850,7 +2851,9 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3012 -p1
 %patch3013 -p1
 %patch3014 -p1
+%if %{?fedora}%{!?fedora:0} >= 20 || %{?rhel}%{!?rhel:0} >= 7
 %patch3015 -p1
+%endif
 
 %build
 cp -f %{SOURCE5} .
@@ -3095,9 +3098,11 @@ for i in fr.UTF-8 it.UTF-8 pl.UTF-8; do
   rm -rf %{buildroot}/%{_mandir}/$i
 done
 
-for i in rvim.1 gvim.1 gvimdiff.1 gex.1 gview.1 gvimtutor.1 vimx.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
+echo ".so man1/vimtutor.1" > %{buildroot}/%{_mandir}/man1/gvimtutor.1
 mkdir -p %{buildroot}/%{_mandir}/man5
 for i in virc.5 vimrc.5; do 
   echo ".so man1/vim.1" > %{buildroot}/%{_mandir}/man5/$i
@@ -3326,6 +3331,10 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Jul 26 2013 Karsten Hopp <karsten@redhat.com> 7.3.1314-2
+- document gex and vimx in man page
+- fix gvimdiff and gvimtutor man page redirects
+
 * Tue Jul 09 2013 Karsten Hopp <karsten@redhat.com> 7.3.1314-1
 - patchlevel 1314