SPECS (AC-branch): vim.spec - some cleaning in manpages; rel. 3.1 NFY

ankry ankry at pld-linux.org
Wed Jun 7 00:07:37 CEST 2006 

Author: ankry                        Date: Tue Jun  6 22:07:37 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- some cleaning in manpages; rel. 3.1 NFY

---- Files affected:
SPECS:
   vim.spec (1.357.2.3 -> 1.357.2.4) 

---- Diffs:

================================================================
Index: SPECS/vim.spec
diff -u SPECS/vim.spec:1.357.2.3 SPECS/vim.spec:1.357.2.4
--- SPECS/vim.spec:1.357.2.3	Tue May 23 10:22:18 2006
+++ SPECS/vim.spec	Wed Jun  7 00:07:32 2006
@@ -19,7 +19,7 @@
 #
 %define		_ver		7.0
 %define		_patchlevel	017
-%define		_rel		3
+%define		_rel		3.1
 
 # cflags get changed while configuring
 %undefine	configure_cache
@@ -82,6 +82,7 @@
 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
@@ -539,6 +540,7 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 # official patches
 %patch201 -p0
@@ -807,18 +809,18 @@
 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
 
 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
@@ -922,43 +924,43 @@
 %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/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(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/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*
 
 %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)
@@ -1069,12 +1071,12 @@
 %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
@@ -1125,6 +1127,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.357.2.4  2006/06/06 22:07:32  ankry
+- some cleaning in manpages; rel. 3.1 NFY
+
 Revision 1.357.2.3  2006/05/23 08:22:18  blues
 - rel. 3 - rebuild for AC
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/vim.spec?r1=1.357.2.3&r2=1.357.2.4&f=u

More information about the pld-cvs-commit mailing list