rpms/vim/FC-5 vim.spec,1.101,1.102

[fedora-cvs-commits at redhat.com]

Author: karsten

Update of /cvs/dist/rpms/vim/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv26843

Modified Files:
	vim.spec 
Log Message:
- patchlevel 35


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/FC-5/vim.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- vim.spec	21 Jun 2006 13:34:48 -0000	1.101
+++ vim.spec	26 Jun 2006 15:17:48 -0000	1.102
@@ -24,7 +24,7 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 022
+%define patchlevel 035
 
 Summary: The VIM editor.
 Name: vim
@@ -76,6 +76,19 @@
 Patch020: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.020
 Patch021: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.021
 Patch022: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.022
+Patch023: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.023
+Patch024: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.024
+Patch025: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.025
+Patch026: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.026
+Patch027: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.027
+Patch028: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.028
+Patch029: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.029
+Patch030: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.030
+Patch031: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.031
+Patch032: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.032
+Patch033: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.033
+Patch034: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.034
+Patch035: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.035
 
 
 Patch3000: vim-7.0-syntax.patch
@@ -119,9 +132,6 @@
 Summary: The common files needed by any version of the VIM editor.
 Group: Applications/Editors
 Obsoletes: vim7-common
-Conflicts: man-pages-fr < 0.9.7-14
-Conflicts: man-pages-it < 0.3.0-17
-Conflicts: man-pages-pl < 0.24-2
 
 %description common
 VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -229,6 +239,22 @@
 %patch020 -p0
 %patch021 -p0
 %patch022 -p0
+%patch023 -p0
+%patch024 -p0
+%patch025 -p0
+%patch026 -p0
+# Win32
+#patch027 -p0
+# OS/2
+#patch028 -p0
+%patch029 -p0
+%patch030 -p0
+%patch031 -p0
+# Win32
+#patch032 -p0
+%patch033 -p0
+%patch034 -p0
+%patch035 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -448,6 +474,11 @@
  )
 (cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;) 
 
+# Remove some man pages which are provided by man-pages-{fr,it,pl}:
+rm -f $RPM_BUILD_ROOT/%{_mandir}/pl/man1/{evim,ex,rview,rvim,view,vim,vimdiff,vimtutor}.1*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/fr/man1/{rview,view,vim,vimdiff,vimtutor}.1*
+rm -f $RPM_BUILD_ROOT/%{_mandir}/it/man1/vim.1*
+
 %post X11
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -565,6 +596,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Jun 26 2006 Karsten Hopp <karsten at redhat.de> 7.0.035-0.fc5
+- patchlevel 35
+- remove conflicts with some man-page packages
+
 * Wed Jun 21 2006 Karsten Hopp <karsten at redhat.de> 7.0.022-2
 - add binfmt_misc rpc_pipefs to fstypes for better mtab highlighting