rpms/vim/devel vim-7.0-rclocation.patch, 1.1, 1.2 vim.spec, 1.103, 1.104

[fedora-cvs-commits at redhat.com]

Author: karsten

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

Modified Files:
	vim-7.0-rclocation.patch vim.spec 
Log Message:
- fix vimrc filename

vim-7.0-rclocation.patch:
 os_unix.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: vim-7.0-rclocation.patch
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim-7.0-rclocation.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vim-7.0-rclocation.patch	23 Mar 2006 13:07:01 -0000	1.1
+++ vim-7.0-rclocation.patch	7 Apr 2006 12:21:10 -0000	1.2
@@ -5,11 +5,11 @@
   */
  #ifndef SYS_VIMRC_FILE
 -# define SYS_VIMRC_FILE "$VIM/vimrc"
-+# define SYS_VIMRC_FILE "/etc/vim7rc"
++# define SYS_VIMRC_FILE "/etc/vimrc"
  #endif
  #ifndef SYS_GVIMRC_FILE
 -# define SYS_GVIMRC_FILE "$VIM/gvimrc"
-+# define SYS_GVIMRC_FILE "/etc/gvim7rc"
++# define SYS_GVIMRC_FILE "/etc/gvimrc"
  #endif
  #ifndef DFLT_HELPFILE
  # define DFLT_HELPFILE	"$VIMRUNTIME/doc/help.txt"


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- vim.spec	4 Apr 2006 14:21:02 -0000	1.103
+++ vim.spec	7 Apr 2006 12:21:10 -0000	1.104
@@ -1,4 +1,4 @@
-%define CVSDATE -20060404
+%define CVSDATE -20060406
 %define WITH_SELINUX 1
 %define desktop_file 1
 %if %{desktop_file}
@@ -26,7 +26,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1
+Release: 2
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{CVSDATE}.tar.bz2
@@ -93,6 +93,7 @@
 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
@@ -502,6 +503,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu Apr 06 2006 Karsten Hopp <karsten at redhat.de> 7.0c.000-2
+- new snapshot
+
 * Tue Apr 04 2006 Karsten Hopp <karsten at redhat.de> 7.0c.000-1
 - vim-7.0c BETA