- "merged" manual pages changes from AC-branch, (re)generate icon-cache,

  use macros in gvim-gnome

Changed files:
    vim.spec -> 1.368

diff --git a/vim.spec b/vim.spec
index 3e5b0cb48019e3cabffe5cfbf14ff3593f8b184a..8f6746892aa39ca3665a309790af13cf91a42763 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -1,5 +1,4 @@
 # TODO:
-# - fix man dirs (encodings in paths - such dirs don't exist in system)
 # - separate vim-spell-en
 # - some nice icon
 # - bonobo patches need update
@@ -83,6 +82,7 @@ Patch19:      %{name}-smarty.patch
 Patch20:       %{name}-tutor-lessdeps.patch
 Patch21:       %{name}-nagios.patch
 Patch22:       %{name}-filetypes.patch
+Patch23:       %{name}-man_installation.patch
 Patch100:      %{name}-bonobo-20050909.patch
 Patch101:      %{name}-bonobo.patch
 Patch102:      %{name}-gtkfilechooser.patch
@@ -452,6 +452,7 @@ Motif, 
 Summary:       Vim for X Window built with gtk
 Summary(pl):   Vim dla X Window korzystaj±cy z biblioteki GTK
 Group:         Applications/Editors/Vim
+Requires(post,postun): gtk+2
 Requires:      %{name}-rt = %{epoch}:%{version}-%{release}
 Requires:      iconv
 Provides:      vi-editor
@@ -480,6 +481,7 @@ GTK, 
 Summary:       Vim for X Window built with GNOME
 Summary(pl):   Vim dla X Window korzystaj±cy z biblioteki GNOME
 Group:         Applications/Editors/Vim
+Requires(post,postun): gtk+2
 Requires:      %{name}-rt = %{epoch}:%{version}-%{release}
 Requires:      iconv
 Provides:      vi-editor
@@ -545,6 +547,7 @@ element bonobo.
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 # official patches
 %patch201 -p0
@@ -812,19 +815,23 @@ ln -sf /bin/vi            $RPM_BUILD_ROOT%{_bindir}/vim
 install src/xxd/xxd    $RPM_BUILD_ROOT%{_bindir}/xxd
 install src/vimtutor   $RPM_BUILD_ROOT%{_bindir}/vimtutor
 
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/*.1
-
-install runtime/doc/vim.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install runtime/doc/xxd.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
-install runtime/doc/vimtutor.1 $RPM_BUILD_ROOT%{_mandir}/man1
+# Moved into patch
+#
+# rm -f $RPM_BUILD_ROOT%{_mandir}/man1/*.1
+# install runtime/doc/vim.1 $RPM_BUILD_ROOT%{_mandir}/man1
+# install runtime/doc/xxd.1 $RPM_BUILD_ROOT%{_mandir}/man1
+# install runtime/doc/vimtutor.1 $RPM_BUILD_ROOT%{_mandir}/man1
+# echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/ex.1
+# echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/rview.1
+# echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/rvim.1
+# echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/view.1
 
-echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/ex.1
-echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/rview.1
-echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/rvim.1
 echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/vi.1
 echo ".so vim.1" > $RPM_BUILD_ROOT%{_mandir}/man1/view.1
 
+# not supported directories
+rm -rf $RPM_BUILD_ROOT%{_mandir}/??.*/
+
 mv -f $RPM_BUILD_ROOT%{_datadir}/vim/v*/vimrc_example.vim $RPM_BUILD_ROOT%{_sysconfdir}/vim/vimrc
 mv -f $RPM_BUILD_ROOT%{_datadir}/vim/v*/gvimrc_example.vim $RPM_BUILD_ROOT%{_sysconfdir}/vim/gvimrc
 
@@ -869,6 +876,10 @@ install src/bin/vim-{component,factory} $RPM_BUILD_ROOT%{_bindir}
 %endif
 
 bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+
+# non-existent binaries
+rm -rf $RPM_BUILD_ROOT%{_mandir}/*/man1/{evim,{,g}vimdiff}.1
+
 unzip -qd $RPM_BUILD_ROOT%{_datadir}/vim/v*/doc %{SOURCE3}
 
 install -d $RPM_BUILD_ROOT%{_datadir}/vim/vimfiles/{doc,{after/,}{compiler,ftdetect,ftplugin,indent,plugin,spell,syntax}}
@@ -897,20 +908,29 @@ rm -rf $RPM_BUILD_ROOT
 
 %post -n gvim-gtk
 [ ! -x /usr/bin/update-desktop-database ] || %update_desktop_database_post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %postun -n gvim-gtk
 [ ! -x /usr/bin/update-desktop-database ] || %update_desktop_database_postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %post -n gvim-gnome
-[ ! -x /usr/bin/update-desktop-database ] || %update_desktop_database_post
+%update_desktop_database_post
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %postun -n gvim-gnome
-[ ! -x /usr/bin/update-desktop-database ] || %update_desktop_database_postun
+%update_desktop_database_postun
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor
 
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/vim
 %attr(755,root,root) %{_bindir}/rvim
+%{_mandir}/man1/rvim.*
+%lang(fi) %{_mandir}/fi/man1/rvim.*
+%lang(fr) %{_mandir}/fr/man1/rvim.*
+%lang(id) %{_mandir}/id/man1/rvim.*
+%lang(pl) %{_mandir}/pl/man1/rvim.*
 %{_desktopdir}/%{name}.desktop
 
 %if %{with static}
@@ -927,43 +947,35 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fi) %{_mandir}/fi/man1/ex.1*
 %lang(fi) %{_mandir}/fi/man1/view.1*
 %lang(fi) %{_mandir}/fi/man1/rview.1*
-%lang(fr) %{_mandir}/fr*/man1/vi.1*
-%lang(fr) %{_mandir}/fr*/man1/evim.1*
-%lang(fr) %{_mandir}/fr*/man1/vim.1*
-%lang(fr) %{_mandir}/fr*/man1/vimdiff.1*
-%lang(fr) %{_mandir}/fr*/man1/vimtutor.1*
-%lang(fr) %{_mandir}/fr*/man1/ex.1*
-%lang(fr) %{_mandir}/fr*/man1/view.1*
-%lang(fr) %{_mandir}/fr*/man1/rview.1*
+%lang(fr) %{_mandir}/fr/man1/vi.1*
+%lang(fr) %{_mandir}/fr/man1/ex.1*
+%lang(fr) %{_mandir}/fr/man1/view.1*
+%lang(fr) %{_mandir}/fr/man1/rview.1*
 %lang(id) %{_mandir}/id/man1/vi.1*
 %lang(id) %{_mandir}/id/man1/ex.1*
 %lang(id) %{_mandir}/id/man1/view.1*
 %lang(id) %{_mandir}/id/man1/rview.1*
-%lang(it) %{_mandir}/it*/man1/ex.1*
-%lang(it) %{_mandir}/it*/man1/evim.1*
-%lang(it) %{_mandir}/it*/man1/view.1*
-%lang(it) %{_mandir}/it*/man1/rview.1*
-%lang(pl) %{_mandir}/pl*/man1/vi.1*
-%lang(pl) %{_mandir}/pl*/man1/evim.1*
-%lang(pl) %{_mandir}/pl*/man1/vim.1*
-%lang(pl) %{_mandir}/pl*/man1/vimdiff.1*
-%lang(pl) %{_mandir}/pl*/man1/vimtutor.1*
-%lang(pl) %{_mandir}/pl*/man1/ex.1*
-%lang(pl) %{_mandir}/pl*/man1/view.1*
-%lang(pl) %{_mandir}/pl*/man1/rview.1*
-%lang(ru) %{_mandir}/ru*/man1/ex.1*
-%lang(ru) %{_mandir}/ru*/man1/evim.1*
-%lang(ru) %{_mandir}/ru*/man1/view.1*
-%lang(ru) %{_mandir}/ru*/man1/rview.1*
+#%lang(it) %{_mandir}/it/man1/vi.1*
+%lang(it) %{_mandir}/it/man1/ex.1*
+%lang(it) %{_mandir}/it/man1/view.1*
+%lang(it) %{_mandir}/it/man1/rview.1*
+%lang(pl) %{_mandir}/pl/man1/vi.1*
+%lang(pl) %{_mandir}/pl/man1/ex.1*
+%lang(pl) %{_mandir}/pl/man1/view.1*
+%lang(pl) %{_mandir}/pl/man1/rview.1*
+#%lang(ru) %{_mandir}/ru/man1/vi.1*
+%lang(ru) %{_mandir}/ru/man1/ex.1*
+%lang(ru) %{_mandir}/ru/man1/view.1*
+%lang(ru) %{_mandir}/ru/man1/rview.1*
 
 %files -n xxd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/xxd
 %{_mandir}/man1/xxd.1*
-%lang(fr) %{_mandir}/fr*/man1/xxd.1*
-%lang(it) %{_mandir}/it*/man1/xxd.1*
-%lang(pl) %{_mandir}/pl*/man1/xxd.1*
-%lang(ru) %{_mandir}/ru*/man1/xxd.1*
+%lang(fr) %{_mandir}/fr/man1/xxd.1*
+%lang(it) %{_mandir}/it/man1/xxd.1*
+%lang(pl) %{_mandir}/pl/man1/xxd.1*
+%lang(ru) %{_mandir}/ru/man1/xxd.1*
 
 %files rt
 %defattr(644,root,root,755)
@@ -1048,10 +1060,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir %{_datadir}/vim/v*/spell
 %{_datadir}/vim/v*/spell/cleanadd.vim
-# XXX: separate vim-spell-en
-%{_datadir}/vim/v*/spell/en.*.*
-%{_datadir}/vim/v*/spell/he.*
-%{_datadir}/vim/v*/spell/yi.*
+%lang(en_GB) %{_datadir}/vim/v*/spell/en.*.*
+%lang(he) %{_datadir}/vim/v*/spell/he.*
+%lang(yi) %{_datadir}/vim/v*/spell/yi.*
 
 %{_datadir}/vim/v*/macros
 %{_datadir}/vim/v*/plugin
@@ -1075,16 +1086,9 @@ rm -rf $RPM_BUILD_ROOT
 %lang(fr) %{_mandir}/fr/man1/gvi*
 %lang(fr) %{_mandir}/fr/man1/rgv*
 %lang(id) %{_mandir}/id/man1/vim*
-%lang(id) %{_mandir}/id/man1/rvim.*
-%lang(id) %{_mandir}/id/man1/gvi*
-%lang(id) %{_mandir}/id/man1/rgv*
-%lang(it) %{_mandir}/it*/man1/vim*
+%lang(it) %{_mandir}/it/man1/vim*
 %lang(pl) %{_mandir}/pl/man1/vim*
-%lang(pl) %{_mandir}/pl/man1/rvim.*
-%lang(pl) %{_mandir}/pl/man1/gvi*
-%lang(pl) %{_mandir}/pl/man1/rgv*
-%lang(ru) %{_mandir}/ru*/man1/vim*
-
+%lang(ru) %{_mandir}/ru/man1/vim*
 %{_iconsdir}/hicolor/16x16/apps/vim.png
 %{_iconsdir}/hicolor/32x32/apps/vim.png
 %{_iconsdir}/hicolor/48x48/apps/vim.png
@@ -1110,6 +1114,14 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/rgvim
 %attr(755,root,root) %{_bindir}/rgview
 %attr(755,root,root) %verify(not link) %{_bindir}/gvim
+%lang(fi) %{_mandir}/fi/man1/gvi*
+%lang(fi) %{_mandir}/fi/man1/rgv*
+%lang(fr) %{_mandir}/fr/man1/gvi*
+%lang(fr) %{_mandir}/fr/man1/rgv*
+%lang(id) %{_mandir}/id/man1/gvi*
+%lang(id) %{_mandir}/id/man1/rgv*
+%lang(pl) %{_mandir}/pl/man1/gvi*
+%lang(pl) %{_mandir}/pl/man1/rgv*
 %{_desktopdir}/gvim-gtk.desktop
 %endif